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

Everything succeeds, but because [ -z ${CI_COMMIT_TAG} ] on the last line returns non-zero, it
fails the job.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7818a02f93523a418f989852d369dee67b6c8b00..6e75082ec1f7ef324ae877e0aaf9a3ec54959fa1 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -388,9 +388,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

diff --git a/tools/ci/executable-list.txt b/tools/ci/executable-list.txt
index 18361a7c90973924c972ae7c638770b3b5f7feba..605cdd1ca351d08e83198def6255f62e32f2d0d2 100644 (file)
--- a/tools/ci/executable-list.txt
+++ b/tools/ci/executable-list.txt
@@ -21,6 +21,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

diff --git a/tools/ci/push_to_github.sh b/tools/ci/push_to_github.sh
new file mode 100755 (executable)
index 0000000..6ea479a
--- /dev/null
+++ b/tools/ci/push_to_github.sh
@@ -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
+