Merge branch 'bugfix/ci_github_deploy_v31' into 'release/v3.1'
ci: Fix spurious pipeline failure when deploying a tag to GitHub (backport v3.1) See merge request idf/esp-idf!3220
This commit is contained in:
commit
f16e78f72c
|
@ -383,9 +383,7 @@ push_to_github:
|
||||||
- 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 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
|
||||||
# Need separate push commands for tag builds and for branch builds
|
- tools/ci/push_to_github.sh
|
||||||
- "[ -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}"
|
|
||||||
|
|
||||||
deploy_docs:
|
deploy_docs:
|
||||||
stage: host_test
|
stage: host_test
|
||||||
|
|
|
@ -19,6 +19,7 @@ tools/ci/checkout_project_ref.py
|
||||||
tools/ci/get-full-sources.sh
|
tools/ci/get-full-sources.sh
|
||||||
tools/ci/mirror-submodule-update.sh
|
tools/ci/mirror-submodule-update.sh
|
||||||
tools/ci/mirror-synchronize.sh
|
tools/ci/mirror-synchronize.sh
|
||||||
|
tools/ci/push_to_github.sh
|
||||||
tools/ci/test_build_system.sh
|
tools/ci/test_build_system.sh
|
||||||
tools/ci/test_configure_ci_environment.sh
|
tools/ci/test_configure_ci_environment.sh
|
||||||
tools/esp_app_trace/apptrace_proc.py
|
tools/esp_app_trace/apptrace_proc.py
|
||||||
|
|
14
tools/ci/push_to_github.sh
Executable file
14
tools/ci/push_to_github.sh
Executable 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
|
||||||
|
|
Loading…
Reference in a new issue