quicker

.gitlab-ci.yml

@@ -7,7 +7,7 @@ cache:
     - out
     - node_modules/
 
-compile_articles:
+compile_articles_and_preview:
   stage: build
   # when: manual
   environment:
@@ -18,6 +18,12 @@ compile_articles:
     - yarn
     - node utils/articleAggregate.js
     - sh utils/commit.sh
+    - npm run export
+    - rm -rf /home/gitlab-runner/deploy/cms/official/out #/home/gitlab-runner/deploy/official/out/
+    - cp -r out /home/gitlab-runner/deploy/cms/official/ #deploy/official
+    # - rm -r /home/gitlab-runner/deploy/official/out
+    # - cp -r out/ /home/gitlab-runner/deploy/official/
+    - echo "预览网站：http://preview.gaorongvc.cn:9945/
 
 # compress_images:
 #   stage: build
@@ -48,26 +54,26 @@ deploy:
     - /home/gitlab-runner/sh/ossutil64 cp -f out oss://gaorong-web/ -r
 
 
-preview:
-  stage: deploy
-  # when: manual
-  environment:
-    name: preview
-  # artifacts:
-  #   name: 'package'
-  #   untracked: true
-  #   expire_in: 12 hours
-  #   paths: 
-  #     - out
-  script:
-    - yarn
-    # - sh utils/imageCompress.sh
-    - npm run export
-    - rm -rf /home/gitlab-runner/deploy/cms/official/out #/home/gitlab-runner/deploy/official/out/
-    - cp -r out /home/gitlab-runner/deploy/cms/official/ #deploy/official
-    # - rm -r /home/gitlab-runner/deploy/official/out
-    # - cp -r out/ /home/gitlab-runner/deploy/official/
-    - echo "预览网站：http://preview.gaorongvc.cn:9945/"
+# preview:
+#   stage: deploy
+#   # when: manual
+#   environment:
+#     name: preview
+#   # artifacts:
+#   #   name: 'package'
+#   #   untracked: true
+#   #   expire_in: 12 hours
+#   #   paths: 
+#   #     - out
+#   script:
+#     - yarn
+#     # - sh utils/imageCompress.sh
+#     - npm run export
+#     - rm -rf /home/gitlab-runner/deploy/cms/official/out #/home/gitlab-runner/deploy/official/out/
+#     - cp -r out /home/gitlab-runner/deploy/cms/official/ #deploy/official
+#     # - rm -r /home/gitlab-runner/deploy/official/out
+#     # - cp -r out/ /home/gitlab-runner/deploy/official/
+#     - echo "预览网站：http://preview.gaorongvc.cn:9945/"