Pārlūkot izejas kodu

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
Angus Gratton 7 gadi atpakaļ
vecāks
revīzija
b1380707e4
3 mainītis faili ar 16 papildinājumiem un 3 dzēšanām
  1. 1 3
      .gitlab-ci.yml
  2. 1 0
      tools/ci/executable-list.txt
  3. 14 0
      tools/ci/push_to_github.sh

+ 1 - 3
.gitlab-ci.yml

@@ -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

+ 1 - 0
tools/ci/executable-list.txt

@@ -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 - 0
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
+