Merge branch 'bugfix/ci_github_deploy_v30' into 'release/v3.0'

ci: Fix spurious pipeline failure when deploying a tag to GitHub (backport v3.0)

See merge request idf/esp-idf!3221
This commit is contained in:
Angus Gratton 2018-09-13 15:36:39 +08:00
commit 2544d737c5
2 changed files with 15 additions and 3 deletions

View file

@ -291,9 +291,7 @@ push_to_github:
- 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
# Need separate push commands for tag builds and for branch builds
- "[ -n \"${CI_COMMIT_TAG}\" ] && git push github ${CI_COMMIT_TAG}"
- "[ -z \"${CI_COMMIT_TAG}\" ] && git push github ${CI_COMMIT_SHA}:refs/heads/${CI_COMMIT_REF_NAME}"
- tools/ci/push_to_github.sh
deploy_docs:
stage: host_test

14
tools/ci/push_to_github.sh Executable file
View file

@ -0,0 +1,14 @@
#!/bin/bash
# gitlab-ci script to push current tested revision (tag or branch) to github
set -ex
if [ -n "${CI_COMMIT_TAG}" ]; then
# for tags
git push github "${CI_COMMIT_TAG}"
else
# for branches
git push github "${CI_COMMIT_SHA}:refs/heads/${CI_COMMIT_REF_NAME}"
fi