ci: fix release branch being pushed into master

Also fix variable quoting issue in link check build.
This commit is contained in:
Ivan Grokhotkov 2017-03-04 18:17:59 +08:00
parent c01dff8263
commit abe8e40597

View file

@ -232,7 +232,7 @@ push_master_to_github:
- 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 add github git@github.com:espressif/esp-idf.git - git remote add github git@github.com:espressif/esp-idf.git
- git push --follow-tags github HEAD:master - git push --follow-tags github HEAD
deploy_docs: deploy_docs:
@ -270,7 +270,7 @@ check_doc_links:
- triggers - triggers
script: script:
# must be triggered with CHECK_LINKS=Yes, otherwise exit without test # must be triggered with CHECK_LINKS=Yes, otherwise exit without test
- test $CHECK_LINKS = "Yes" || exit 0 - test "$CHECK_LINKS" = "Yes" || exit 0
# can only run on master branch (otherwise the commit is not on Github yet) # can only run on master branch (otherwise the commit is not on Github yet)
- test "${CI_BUILD_REF_NAME}" = "master" || exit 0 - test "${CI_BUILD_REF_NAME}" = "master" || exit 0
- cd docs - cd docs