]> granicus.if.org Git - esp-idf/commitdiff
ci: Fix master branch being pushed to master
authorAngus Gratton <angus@espressif.com>
Fri, 17 Mar 2017 04:00:25 +0000 (12:00 +0800)
committerAngus Gratton <angus@espressif.com>
Fri, 17 Mar 2017 10:17:41 +0000 (18:17 +0800)
Previous change in 8b6993f7 doesn't work if branch exists locally.

.gitlab-ci.yml

index 3743df9f158a22c717b91c4c77096ff980def22a..dc8f5f6b890001ed2b34eddd94dbf977ae6e6f74 100644 (file)
@@ -240,7 +240,7 @@ push_master_to_github:
     #
     # NB: In gitlab 9.x, CI_BUILD_REF was deprecated. New name is CI_COMMIT_REF. If below command suddenly
     # generates bash syntax errors, this is probably why.
-    - eval $(git for-each-ref --shell bash --format 'if [ $CI_BUILD_REF == %(objectname) ]; then git checkout -b %(refname:strip=3); git push --follow-tags github %(refname:strip=3); fi;' $GITHUB_PUSH_REFS)
+    - eval $(git for-each-ref --shell bash --format 'if [ $CI_BUILD_REF == %(objectname) ]; then git checkout -B %(refname:strip=3); git push --follow-tags github %(refname:strip=3); fi;' $GITHUB_PUSH_REFS)
 
 
 deploy_docs: