Browse Source

测试 drone

liql 2 years ago
parent
commit
1b4d13e35d
2 changed files with 49 additions and 23 deletions
  1. 44 19
      .idea/workspace.xml
  2. 5 4
      drone.yml

+ 44 - 19
.idea/workspace.xml

@@ -2,9 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="976cff0c-f89f-44cb-af06-490875979f12" name="默认变更列表" comment="修改动态css文件名">
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/drone.yml" beforeDir="false" afterPath="$PROJECT_DIR$/drone.yml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -22,6 +21,7 @@
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+    <option name="UPDATE_TYPE" value="MERGE" />
   </component>
   <component name="ProjectId" id="22Fxbwuff2wEz75ItTtPexz5wsx" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
@@ -34,12 +34,14 @@
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/images" />
+    <property name="aspect.path.notification.shown" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="list.type.of.created.stylesheet" value="CSS" />
     <property name="vue.rearranger.settings.migration" value="true" />
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="E:\project\veterans_demo" />
       <recent name="H:\company-project\veterans_demo\images" />
       <recent name="H:\company-project\veterans_demo\styles" />
       <recent name="H:\company-project\veterans_demo\js" />
@@ -49,13 +51,11 @@
     <configuration name="index.html" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/veterans_demo/index.html" useBuiltInWebServerPort="true">
       <method v="2" />
     </configuration>
-    <recent_temporary>
-      <list>
-        <item itemvalue="JavaScript 调试.index.html" />
-      </list>
-    </recent_temporary>
   </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
+  <component name="SpellCheckerSettings" BundledDictionaries="0" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" Dictionaries="0" CorrectionsLimit="5" DefaultDictionary="应用程序级" UseSingleDictionary="true" />
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="默认任务">
       <changelist id="976cff0c-f89f-44cb-af06-490875979f12" name="默认变更列表" comment="" />
@@ -67,6 +67,7 @@
       <workItem from="1639531366831" duration="1130000" />
       <workItem from="1639534138974" duration="183000" />
       <workItem from="1639534357485" duration="558000" />
+      <workItem from="1671597949746" duration="1643000" />
     </task>
     <task id="LOCAL-00001" summary="修改动态css文件名">
       <created>1639534218235</created>
@@ -75,11 +76,25 @@
       <option name="project" value="LOCAL" />
       <updated>1639534218235</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="测试 drone">
+      <created>1671598958729</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1671598958729</updated>
+    </task>
+    <task id="LOCAL-00003" summary="测试 drone">
+      <created>1671599131193</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1671599131193</updated>
+    </task>
+    <option name="localTasksCounter" value="4" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
+    <option name="version" value="1" />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
     <option name="TAB_STATES">
@@ -87,20 +102,30 @@
         <entry key="MAIN">
           <value>
             <State>
-              <option name="CUSTOM_BOOLEAN_PROPERTIES">
-                <map>
-                  <entry key="Show.Git.Branches" value="false" />
-                </map>
-              </option>
+              <option name="COLUMN_ORDER" />
             </State>
           </value>
         </entry>
       </map>
     </option>
-    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="修改动态css文件名" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改动态css文件名" />
+    <MESSAGE value="测试 drone" />
+    <option name="LAST_COMMIT_MESSAGE" value="测试 drone" />
+  </component>
+  <component name="WindowStateProjectService">
+    <state x="581" y="113" key="CommitChangelistDialog2" timestamp="1671599130207">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="581" y="113" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1671599130207" />
+    <state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1671599139797">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1671599139797" />
+    <state x="752" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1671598966787">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="752" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1040@0.0.1920.1040" timestamp="1671598966787" />
   </component>
 </project>

+ 5 - 4
drone.yml

@@ -11,8 +11,9 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行
       - name: node-build
         path: /tmp
     commands: # 定义在Docker容器中执行的shell命令
-      - pwd
       - ls
+      - mkdir -p /tmp/*name
+      - cp -r images index.html js styles /tmp/*name
 
   - name: deploy
     image: appleboy/drone-ssh # SSH工具镜像
@@ -24,9 +25,9 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行
       port: 22 # 远程连接端口
       command_timeout: 5m # 远程执行命令超时时间
       script:
-        - mv /www/wwwroot/veteransteacher/ /tmp/$(uuidgen)
-        - mkdir -p /www/wwwroot/veteransteacher
-        - cp -r /mydata/node/build/*name/dist/* /www/wwwroot/veteransteacher # 进入宿主机构建目录
+        - mv /www/wwwroot/veterentry.hw.hongweisoft.com/ /tmp/$(uuidgen)
+        - mkdir -p /www/wwwroot/veterentry.hw.hongweisoft.com
+        - cp -r /mydata/node/build/*name/* /www/wwwroot/veterentry.hw.hongweisoft.com # 进入宿主机构建目录
 
 volumes:
   # 定义流水线挂载目录,用于共享数据