Update .gitlab-ci.yml

.gitlab-ci.yml

@@ -64,12 +64,12 @@ pushSolution:
   - 'git reset --hard head'
   - 'git clean -fd'
   - 'git remote set-url origin "https://${GIT_ACCESS_USER}:${GIT_ACCESS_PASSWORD}@g.civnet.cn:8443/PandaSolution/civbase.git"'
-  - 'git pull origin'
+  - 'git pull origin -master'
   - 'git rm -rf --ignore-unmatch "${TARGET_REPO_Solution}"'
   - 'robocopy "${CI_PROJECT_DIR}/../PublishTemp/civbase" "${TARGET_REPO_Solution}" /S ;
         IF ((${LASTEXITCODE} -le 8)) {cmd /c "exit /b 0"}'
   - 'git add . ; git commit --allow-empty -m "auto package civbase."'
-  - 'git push origin'
+  - 'git push origin -master'
   only:
     refs:
       - master
@@ -87,14 +87,12 @@ push2021:
   - '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"'
-  #- 'git pull origin map --allow-unrelated-histories'
   - 'git pull origin map'
   - 'git rm -rf "${TARGET_REPO_2021}/civbase"'
   - 'robocopy "${CI_PROJECT_DIR}/../PublishTemp/civbase" "${TARGET_REPO_2021}/civbase" /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 civbase."'
   - 'git push origin map'
-
   only:
     - master
   when: on_success