Update .gitlab-ci.yml

.gitlab-ci.yml

 variables:
   TARGET_REPO_2021: "F:/CIV_CI/CivWebPublish2021_CIVWeb5/CivWebPublish2021/"
+  TARGET_REPO_SOLU: "F:/CIV_CI/PandaSolution/civmanage"
   GIT_STRATEGY: 'fetch'
   GIT_CHECKOUT: 'false'
 
@@ -56,7 +57,7 @@ push:
     GIT_STRATEGY: none
   stage: push
   script:
-    - 'cd "${TARGET_REPO_2021}"'
+    - 'cd "${TARGET_REPO_SOLU}"'
     - 'git reset --hard head'
     - 'git clean -fd'
     - 'git remote set-url origin "https://${GIT_ACCESS_USER}:${GIT_ACCESS_PASSWORD}@g.civnet.cn:8443/CivPublish/CivWebPublish2021.git"'
@@ -64,7 +65,7 @@ push:
     #- 'git rm -rf "${TARGET_REPO_2021}/civmanage"'
     #- 'git commit -m "chore: clear folder civmanage"'
     #- 'git push origin map'
-    - 'robocopy "${CI_PROJECT_DIR}/../CivWebPublish2021/civmanage" "${TARGET_REPO_2021}/civmanage" /S ;
+    - 'robocopy "${CI_PROJECT_DIR}/../CivWebPublish2021/civmanage" "${TARGET_REPO_SOLU}/" /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 -m "auto package civmanage."'
     - 'git push origin map'
@@ -72,3 +73,22 @@ push:
   only:
     - master
   when: manual
+  
+push_solu:
+  variables:
+    GIT_STRATEGY: none
+  stage: push
+  script:
+    - 'cd "${TARGET_REPO_2021}"'
+    - 'git reset --hard head'
+    - '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 master'
+    - 'robocopy "${CI_PROJECT_DIR}/../CivWebPublish2021/civmanage" "${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 -m "auto package civmanage."'
+    - 'git push origin master'
+  allow_failure: false
+  only:
+    - master
+  when: manual