Преглед изворни кода

Merge branch 'bugfix/ci_push_master_to_github_err' into 'master'

Fix error in the push_master_to_github job when using the fetch strategy

See merge request !951

Ivan Grokhotkov пре 8 година
родитељ
комит
3c9ea3cb8e
1 измењених фајлова са 1 додато и 0 уклоњено
  1. 1 0
      .gitlab-ci.yml

+ 1 - 0
.gitlab-ci.yml

@@ -305,6 +305,7 @@ push_master_to_github:
     - base64 --decode --ignore-garbage ~/.ssh/id_rsa_base64 > ~/.ssh/id_rsa
     - base64 --decode --ignore-garbage ~/.ssh/id_rsa_base64 > ~/.ssh/id_rsa
     - chmod 600 ~/.ssh/id_rsa
     - chmod 600 ~/.ssh/id_rsa
     - echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
     - echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
+    - git remote remove github &>/dev/null || true
     - git remote add github git@github.com:espressif/esp-idf.git
     - git remote add github git@github.com:espressif/esp-idf.git
     # What the next line of script does: goes through the list of refs for all branches we push to github,
     # What the next line of script does: goes through the list of refs for all branches we push to github,
     # generates a snippet of shell which is evaluated. The snippet checks CI_COMMIT_SHA against the SHA
     # generates a snippet of shell which is evaluated. The snippet checks CI_COMMIT_SHA against the SHA