Skip to content

D
dymas
Commit 0c9e8d60 authored by lixiaofang's avatar lixiaofang
Browse files
Options

Merge branch 'test' into week

parents a160fe99 4f3bd4de
Show whitespace changes
Inline Side-by-side
Showing with 104 additions and 54 deletions
.idea/workspace.xml
View file @ 0c9e8d60
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="ae0ff912-332d-4611-9939-a4d235689946" name="Default Changelist" comment=""> <list default="true" id="ae0ff912-332d-4611-9939-a4d235689946" name="Default Changelist" comment="" />
<change beforePath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -23,35 +20,35 @@ ...@@ -23,35 +20,35 @@
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.open"> <usages-collector id="statistics.file.extensions.open">
<counts> <counts>
<entry key="py" value="22" /> <entry key="py" value="24" />
<entry key="txt" value="1" /> <entry key="txt" value="2" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.open"> <usages-collector id="statistics.file.types.open">
<counts> <counts>
<entry key="PLAIN_TEXT" value="1" /> <entry key="PLAIN_TEXT" value="2" />
<entry key="Python" value="22" /> <entry key="Python" value="24" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.edit"> <usages-collector id="statistics.file.extensions.edit">
<counts> <counts>
<entry key="py" value="1" /> <entry key="py" value="6" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.edit"> <usages-collector id="statistics.file.types.edit">
<counts> <counts>
<entry key="Python" value="1" /> <entry key="Python" value="6" />
</counts> </counts>
</usages-collector> </usages-collector>
</session> </session>
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/search/views/sku.py"> <entry file="file://$PROJECT_DIR$/search/views/sku.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="486"> <state relative-caret-position="476">
<caret line="112" column="15" selection-start-line="112" selection-start-column="15" selection-end-line="112" selection-end-column="15" /> <caret line="90" selection-start-line="90" selection-end-line="90" />
<folding> <folding>
<element signature="e#24#52#0" expanded="true" /> <element signature="e#24#52#0" expanded="true" />
<element signature="e#1704#2757#0" /> <element signature="e#1704#2757#0" />
...@@ -70,10 +67,37 @@ ...@@ -70,10 +67,37 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/doris/log_settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="9" column="26" selection-start-line="9" selection-start-column="26" selection-end-line="9" selection-end-column="26" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/requirements.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360">
<caret line="24" column="15" selection-start-line="24" selection-start-column="15" selection-end-line="24" selection-end-column="15" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/doris/devel.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="43" column="56" selection-start-line="43" selection-start-column="56" selection-end-line="43" selection-end-column="56" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/search/utils/service.py"> <entry file="file://$PROJECT_DIR$/search/utils/service.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2175"> <state relative-caret-position="1313">
<caret line="1086" column="46" selection-start-line="1086" selection-start-column="46" selection-end-line="1086" selection-end-column="46" /> <caret line="1086" column="46" selection-start-line="1086" selection-start-column="46" selection-end-line="1086" selection-end-column="46" />
<folding> <folding>
<element signature="e#0#29#0" expanded="true" /> <element signature="e#0#29#0" expanded="true" />
...@@ -96,6 +120,8 @@ ...@@ -96,6 +120,8 @@
<find>》</find> <find>》</find>
<find>&lt;&lt;&lt;</find> <find>&lt;&lt;&lt;</find>
<find>&gt;&gt;&gt;</find> <find>&gt;&gt;&gt;</find>
<find>/data/lo</find>
<find>urllib3</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -107,7 +133,6 @@ ...@@ -107,7 +133,6 @@
<option value="$PROJECT_DIR$/libs/es.py" /> <option value="$PROJECT_DIR$/libs/es.py" />
<option value="$PROJECT_DIR$/libs/filters.py" /> <option value="$PROJECT_DIR$/libs/filters.py" />
<option value="$PROJECT_DIR$/hera/views.py" /> <option value="$PROJECT_DIR$/hera/views.py" />
<option value="$PROJECT_DIR$/requirements.txt" />
<option value="$PROJECT_DIR$/recommend/utils/diary_portrait.py" /> <option value="$PROJECT_DIR$/recommend/utils/diary_portrait.py" />
<option value="$PROJECT_DIR$/search/utils/service.py" /> <option value="$PROJECT_DIR$/search/utils/service.py" />
<option value="$PROJECT_DIR$/search/utils/sku.py" /> <option value="$PROJECT_DIR$/search/utils/sku.py" />
...@@ -123,11 +148,13 @@ ...@@ -123,11 +148,13 @@
<option value="$PROJECT_DIR$/search/views/tractate.py" /> <option value="$PROJECT_DIR$/search/views/tractate.py" />
<option value="$PROJECT_DIR$/search/views/diary.py" /> <option value="$PROJECT_DIR$/search/views/diary.py" />
<option value="$PROJECT_DIR$/search/management/commands/debugscript.py" /> <option value="$PROJECT_DIR$/search/management/commands/debugscript.py" />
<option value="$PROJECT_DIR$/doris/log_settings.py" />
<option value="$PROJECT_DIR$/requirements.txt" />
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="-323" /> <option name="x" value="239" />
<option name="y" value="-1080" /> <option name="y" value="-1080" />
<option name="width" value="1920" /> <option name="width" value="1920" />
<option name="height" value="1080" /> <option name="height" value="1080" />
...@@ -165,13 +192,7 @@ ...@@ -165,13 +192,7 @@
<path> <path>
<item name="dymas" type="b2602c69:ProjectViewProjectNode" /> <item name="dymas" type="b2602c69:ProjectViewProjectNode" />
<item name="dymas" type="462c0819:PsiDirectoryNode" /> <item name="dymas" type="462c0819:PsiDirectoryNode" />
<item name="search" type="462c0819:PsiDirectoryNode" /> <item name="doris" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dymas" type="b2602c69:ProjectViewProjectNode" />
<item name="dymas" type="462c0819:PsiDirectoryNode" />
<item name="search" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
</path> </path>
</expand> </expand>
<select /> <select />
...@@ -232,7 +253,7 @@ ...@@ -232,7 +253,7 @@
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-323" y="-1080" width="1920" height="1080" extended-state="0" /> <frame x="-286" y="-1080" width="1920" height="1080" extended-state="0" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20537125" /> <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20537125" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
...@@ -247,7 +268,7 @@ ...@@ -247,7 +268,7 @@
<window_info anchor="bottom" id="TODO" order="6" /> <window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="DB Execution Console" order="8" /> <window_info anchor="bottom" id="DB Execution Console" order="8" />
<window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.29222798" /> <window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.44455957" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
<window_info anchor="bottom" id="Python Console" order="11" /> <window_info anchor="bottom" id="Python Console" order="11" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
...@@ -315,13 +336,6 @@ ...@@ -315,13 +336,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/requirements.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="211">
<caret line="22" column="15" lean-forward="true" selection-start-line="22" selection-start-column="15" selection-end-line="22" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/recommend/utils/diary_portrait.py"> <entry file="file://$PROJECT_DIR$/recommend/utils/diary_portrait.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="171"> <state relative-caret-position="171">
...@@ -374,13 +388,6 @@ ...@@ -374,13 +388,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/doris/devel.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="288">
<caret line="57" column="48" selection-start-line="57" selection-start-column="48" selection-end-line="57" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/recommend/views/detail.py"> <entry file="file://$PROJECT_DIR$/recommend/views/detail.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228"> <state relative-caret-position="228">
...@@ -447,10 +454,39 @@ ...@@ -447,10 +454,39 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/doris/devel.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="43" column="56" selection-start-line="43" selection-start-column="56" selection-end-line="43" selection-end-column="56" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/doris/log_settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="9" column="26" selection-start-line="9" selection-start-column="26" selection-end-line="9" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/search/utils/service.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1313">
<caret line="1086" column="46" selection-start-line="1086" selection-start-column="46" selection-end-line="1086" selection-end-column="46" />
<folding>
<element signature="e#0#29#0" expanded="true" />
<element signature="e#2279#18958#0" />
<element signature="e#19008#19440#0" />
<element signature="e#20018#23998#0" />
<element signature="e#24048#25735#0" />
<element signature="e#25820#36425#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/search/views/sku.py"> <entry file="file://$PROJECT_DIR$/search/views/sku.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="486"> <state relative-caret-position="476">
<caret line="112" column="15" selection-start-line="112" selection-start-column="15" selection-end-line="112" selection-end-column="15" /> <caret line="90" selection-start-line="90" selection-end-line="90" />
<folding> <folding>
<element signature="e#24#52#0" expanded="true" /> <element signature="e#24#52#0" expanded="true" />
<element signature="e#1704#2757#0" /> <element signature="e#1704#2757#0" />
...@@ -468,18 +504,10 @@ ...@@ -468,18 +504,10 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/search/utils/service.py"> <entry file="file://$PROJECT_DIR$/requirements.txt">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2175"> <state relative-caret-position="360">
<caret line="1086" column="46" selection-start-line="1086" selection-start-column="46" selection-end-line="1086" selection-end-column="46" /> <caret line="24" column="15" selection-start-line="24" selection-start-column="15" selection-end-line="24" selection-end-column="15" />
<folding>
<element signature="e#0#29#0" expanded="true" />
<element signature="e#2279#18958#0" />
<element signature="e#19008#19440#0" />
<element signature="e#20018#23998#0" />
<element signature="e#24048#25735#0" />
<element signature="e#25820#36425#0" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
Jenkinsfile
View file @ 0c9e8d60
...@@ -32,8 +32,20 @@ pipeline { ...@@ -32,8 +32,20 @@ pipeline {
dingNotify "before" dingNotify "before"
} }
} }
stage('Check Code') {
//when { branch 'test' }
steps {
script {
currentBuild.displayName = "Check-Code"
checkCode "3.6"
}
}
}
stage('Build') { stage('Build') {
steps { steps {
script {
currentBuild.displayName = "Build-Image"
}
sh "docker build . ${params.cache} -f ./Dockerfile -t $IMAGE" sh "docker build . ${params.cache} -f ./Dockerfile -t $IMAGE"
sh "docker push $IMAGE" sh "docker push $IMAGE"
} }
...@@ -43,7 +55,16 @@ pipeline { ...@@ -43,7 +55,16 @@ pipeline {
post { post {
always { always {
script {
def stage = "${currentBuild.displayName}"
if (stage == "Check-Code" && fileExists("./flake.output.txt")) {
def description = readFile("./flake.output.txt")
dingNotify "after", "${currentBuild.currentResult}", "${description}"
} else {
dingNotify "after", "${currentBuild.currentResult}" dingNotify "after", "${currentBuild.currentResult}"
} }
} }
recordIssues enabledForFailure: true, tools: [flake8()]
}
}
} }
\ No newline at end of file
requirements.txt
View file @ 0c9e8d60
...@@ -22,7 +22,7 @@ kombu==4.0.2 ...@@ -22,7 +22,7 @@ kombu==4.0.2
meld3==1.0.2 meld3==1.0.2
requests==2.2.1 requests==2.2.1
ssh-import-id==3.21 ssh-import-id==3.21
urllib3==1.7.1 urllib3==1.21.1
vine==1.1.3 vine==1.1.3
virtualenv==15.1.0 virtualenv==15.1.0
wheel==0.24.0 wheel==0.24.0
...@@ -31,7 +31,7 @@ redis==2.10.5 ...@@ -31,7 +31,7 @@ redis==2.10.5
gunicorn==19.7.1 gunicorn==19.7.1
gevent==1.2.1 gevent==1.2.1
pygments==2.2.0 pygments==2.2.0
elasticsearch==7.1.0 elasticsearch==6.3.1
django-autocomplete-light==3.2.2 django-autocomplete-light==3.2.2
pyssdb==0.4.1 pyssdb==0.4.1
protobuf==3.6.0 protobuf==3.6.0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment