第一次自动化打包部署_003

应该是windows编写脚本时附带的错误

第一次自动化打包部署_003
应该是windows编写脚本时附带的错误
d8881b73 · ToBeADevOps · 292fac55 · d8881b73 · d8881b73
隐藏空白更改
内联并排

Showing with 32 addition and 17 deletion

.idea/workspace.xml .idea/workspace.xml +31 -16

Jenkinsfile Jenkinsfile +1 -1

未找到文件。
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="ChangeListManager">
-    <list default="true" id="b607d0ec-6b80-4527-85ad-7c1c544feb41" name="Default Changelist" comment="">
+    <list default="true" id="b607d0ec-6b80-4527-85ad-7c1c544feb41" name="Default Changelist" comment="第一次自动化打包部署_003&#10;应该是windows编写脚本时附带的错误">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/Jenkinsfile" beforeDir="false" afterPath="$PROJECT_DIR$/Jenkinsfile" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Package.sh" beforeDir="false" afterPath="$PROJECT_DIR$/Package.sh" afterDir="false" />
    </list>
    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
    <option name="SHOW_DIALOG" value="false" />
@@ -47,8 +46,8 @@
      <file pinned="false" current-in-tab="true">
        <entry file="file://$PROJECT_DIR$/Jenkinsfile">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="324">
-              <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
+            <state relative-caret-position="459">
+              <caret line="23" column="5" lean-forward="true" selection-start-line="23" selection-start-column="5" selection-end-line="23" selection-end-column="5" />
            </state>
          </provider>
        </entry>
@@ -65,8 +64,8 @@
      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/Package.sh">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="189">
-              <caret line="7" column="2" lean-forward="true" selection-start-line="7" selection-start-column="2" selection-end-line="7" selection-end-column="2" />
+            <state relative-caret-position="297">
+              <caret line="11" column="2" lean-forward="true" selection-start-line="11" selection-start-column="2" selection-end-line="11" selection-end-column="2" />
            </state>
          </provider>
        </entry>
@@ -266,7 +265,7 @@
      <workItem from="1599544205353" duration="2756000" />
      <workItem from="1599616376904" duration="1163000" />
      <workItem from="1599633655657" duration="4243000" />
-      <workItem from="1599638342388" duration="34000" />
+      <workItem from="1599638342388" duration="563000" />
    </task>
    <task id="LOCAL-00001" summary="Merge remote-tracking branch 'origin/master' into master&#10;&#10;# Conflicts:&#10;#&#9;Jenkinsfile">
      <created>1599480767017</created>
@@ -443,17 +442,31 @@
      <option name="project" value="LOCAL" />
      <updated>1599638274998</updated>
    </task>
-    <option name="localTasksCounter" value="26" />
+    <task id="LOCAL-00026" summary="第一次自动化打包部署_001&#10;Package脚本文件无法执行，将打包命令放在步骤中">
+      <created>1599638430934</created>
+      <option name="number" value="00026" />
+      <option name="presentableId" value="LOCAL-00026" />
+      <option name="project" value="LOCAL" />
+      <updated>1599638430934</updated>
+    </task>
+    <task id="LOCAL-00027" summary="第一次自动化打包部署_002&#10;打包命令正常，脚本文件存在错误，尝试排查">
+      <created>1599638681888</created>
+      <option name="number" value="00027" />
+      <option name="presentableId" value="LOCAL-00027" />
+      <option name="project" value="LOCAL" />
+      <updated>1599638681888</updated>
+    </task>
+    <option name="localTasksCounter" value="28" />
    <servers />
  </component>
  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="34930000" />
+    <option name="totallyTimeSpent" value="35459000" />
  </component>
  <component name="ToolWindowManager">
    <frame x="1433" y="548" width="2062" height="1136" extended-state="6" />
    <editor active="true" />
    <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49900398" visible="true" weight="0.17814371" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49900398" visible="true" weight="0.17814371" />
      <window_info id="Structure" order="1" sideWeight="0.500996" side_tool="true" weight="0.16916168" />
      <window_info id="Favorites" order="2" side_tool="true" />
      <window_info anchor="bottom" id="Message" order="0" />
@@ -467,7 +480,7 @@
      <window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.499501" weight="0.32968128" />
      <window_info anchor="bottom" id="Database Changes" order="9" />
      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50748503" side_tool="true" weight="0.32968128" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="11" sideWeight="0.49251497" visible="true" weight="0.32968128" />
+      <window_info anchor="bottom" id="Terminal" order="11" sideWeight="0.49251497" visible="true" weight="0.32968128" />
      <window_info anchor="bottom" id="Python Console" order="12" weight="0.32968128" />
      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -496,7 +509,9 @@
    <MESSAGE value="sany" />
    <MESSAGE value="完善了基础模板" />
    <MESSAGE value="第一次自动化打包部署" />
-    <option name="LAST_COMMIT_MESSAGE" value="第一次自动化打包部署" />
+    <MESSAGE value="第一次自动化打包部署_001&#10;Package脚本文件无法执行，将打包命令放在步骤中" />
+    <MESSAGE value="第一次自动化打包部署_002&#10;打包命令正常，脚本文件存在错误，尝试排查" />
+    <option name="LAST_COMMIT_MESSAGE" value="第一次自动化打包部署_002&#10;打包命令正常，脚本文件存在错误，尝试排查" />
  </component>
  <component name="editorHistoryManager">
    <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38-32/Lib/threading.py">
@@ -604,15 +619,15 @@
    </entry>
    <entry file="file://$PROJECT_DIR$/Package.sh">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="189">
-          <caret line="7" column="2" lean-forward="true" selection-start-line="7" selection-start-column="2" selection-end-line="7" selection-end-column="2" />
+        <state relative-caret-position="297">
+          <caret line="11" column="2" lean-forward="true" selection-start-line="11" selection-start-column="2" selection-end-line="11" selection-end-column="2" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Jenkinsfile">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="324">
-          <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
+        <state relative-caret-position="459">
+          <caret line="23" column="5" lean-forward="true" selection-start-line="23" selection-start-column="5" selection-end-line="23" selection-end-column="5" />
        </state>
      </provider>
    </entry>

--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,7 +18,7 @@ pipeline {
    stage('Build') {
      steps {
        echo 'start Build...'
-        sh 'sh Package.sh'
+        sh 'sed -i "s/\r$//" Package.sh $$ sh Package.sh'
        bat 'python setup.py sdist'
      }
    }