Update .gitlab-ci.yml

.gitlab-ci.yml

 variables:
   TARGET_REPO_2021: "G:/CIV_CI/CivWebPublish2021_CivManage/CivWebPublish2021/"
   TARGET_REPO_Solution: "G:/CIV_CI/PandaSolution/civmanage/"
+  TEMP_DIR: "G:/CIV_CI/tempV1/civmanage/"
   GIT_STRATEGY: 'fetch'
   GIT_CHECKOUT: 'false'
 
@@ -12,8 +13,7 @@ stages:
   - checkout
   - install
   - package
-  - push_2021
-  - push_solution
+  - push
   
 checkout:
   stage: checkout
@@ -45,7 +45,8 @@ package:
   script:
   - echo "${CI_PROJECT_DIR}"
   - git pull origin master
-  - npm run build --releasepath=../CivWebPublish2021
+  #- npm run build --releasepath=../CivWebPublish2021
+  - npm run build --releasepath=${TEMP_DIR}
   allow_failure: false
   only:
     - master
@@ -54,7 +55,7 @@ package:
 push_2021:
   variables:
     GIT_STRATEGY: none
-  stage: push_2021
+  stage: push
   tags:
     - civ_manage_128
   script:
@@ -63,7 +64,8 @@ push_2021:
     - 'git clean -fd'
     - 'git remote set-url origin "https://${GIT_ACCESS_USER}:${GIT_ACCESS_PASSWORD}@g.civnet.cn:8443/CivPublish/CivWebPublish2021.git"'
     - 'git pull origin map'
-    - 'robocopy "${CI_PROJECT_DIR}/../CivWebPublish2021/civmanage" "${TARGET_REPO_2021}/civmanage" /S ;
+    #- 'robocopy "${CI_PROJECT_DIR}/../CivWebPublish2021/civmanage" "${TARGET_REPO_2021}/civmanage" /S ;
+    - 'robocopy "${TEMP_DIR}/" "${TARGET_REPO_2021}/civmanage" /S ;
         IF ((${LASTEXITCODE} -le 8)) {cmd /c "exit /b 0"}'
     - 'git add . ; git reset HEAD Web.config CityInterface/Web.config CityWebFW/Web.config ; git commit --allow-empty -m "auto package civmanage."'
     - 'git push origin map'
@@ -74,7 +76,7 @@ push_2021:
 push_solution:
   variables:
     GIT_STRATEGY: none
-  stage: push_solution
+  stage: push
   tags:
     - civ_manage_128
   script:
@@ -83,10 +85,10 @@ push_solution:
     - 'git clean -fd'
     - 'git remote set-url origin "https://${GIT_ACCESS_USER}:${GIT_ACCESS_PASSWORD}@g.civnet.cn:8443/PandaSolution/civmanage.git"'
     - 'git pull origin'
-    - 'robocopy "${CI_PROJECT_DIR}/../CivWebPublish2021/civmanage" "${TARGET_REPO_Solution}" /S ;
+    #- 'robocopy "${CI_PROJECT_DIR}/../CivWebPublish2021/civmanage" "${TARGET_REPO_Solution}" /S ;
+    - 'robocopy "${TEMP_DIR}/" "${TARGET_REPO_Solution}/" /S ;
         IF ((${LASTEXITCODE} -le 8)) {cmd /c "exit /b 0"}'
     - 'git add . ; git reset HEAD ; git commit --allow-empty -m "auto package civmanage."'
     - 'git push origin'
   only:
     - master
-  when: on_success