Merge branch 'bugfix/ci_github_deploy' into 'master'

ci: Fix spurious pipeline failure when deploying a tag to GitHub

See merge request idf/esp-idf!3021
This commit is contained in:
Angus Gratton 2018-09-05 18:07:24 +08:00
commit b1380707e4
3 changed files with 16 additions and 3 deletions

View File

@ -454,9 +454,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

View File

@ -22,6 +22,7 @@ tools/ci/checkout_project_ref.py
tools/ci/get-full-sources.sh
tools/ci/mirror-submodule-update.sh
tools/ci/mirror-synchronize.sh
tools/ci/push_to_github.sh
tools/ci/test_build_system.sh
tools/ci/test_configure_ci_environment.sh
tools/esp_app_trace/apptrace_proc.py

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