From 9635b1acb7d2152be9518b85b42184e188f91455 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Wed, 20 Oct 2021 11:28:19 -0700 Subject: [PATCH 1/3] Updating the release branch constraint and the CI pipeline code constraint --- .github/workflows/release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fba056941f..40cf4f0d67 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,9 +15,9 @@ jobs: steps: - name: Branch check run: | - if [[ "$GITHUB_REF" != "refs/heads/rc" ]]; then + if [[ "$GITHUB_REF" != "refs/heads/release" ]] || [[ "$GITHUB_REF" != "refs/heads/master" ]]; then echo "===================================" - echo "[!] Can only release from rc branch" + echo "[!] Can only release from the 'release' or 'master' branches" echo "===================================" exit 1 fi @@ -25,7 +25,7 @@ jobs: - name: Checkout repo uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f with: - ref: rc + ref: release - name: Check Release Version id: version @@ -88,7 +88,7 @@ jobs: with: workflow: build.yml workflow_conclusion: success - branch: rc + branch: release artifacts: 'browser-source-*.zip, dist-chrome-*.zip, dist-opera-*.zip, From ecfb80fd6d41fa0c88d93d62613905ca977e1631 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Thu, 21 Oct 2021 08:15:51 -0700 Subject: [PATCH 2/3] removing the master branch CI code execution --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 40cf4f0d67..94c590aa3e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,9 +15,9 @@ jobs: steps: - name: Branch check run: | - if [[ "$GITHUB_REF" != "refs/heads/release" ]] || [[ "$GITHUB_REF" != "refs/heads/master" ]]; then + if [[ "$GITHUB_REF" != "refs/heads/release" ]]; then echo "===================================" - echo "[!] Can only release from the 'release' or 'master' branches" + echo "[!] Can only release from the 'release' branches" echo "===================================" exit 1 fi From d992b13a0b6cab94231d80c21a6de0522ed85d96 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Thu, 21 Oct 2021 08:33:40 -0700 Subject: [PATCH 3/3] updating some verbiage --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 94c590aa3e..1fff1dbcef 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,7 @@ jobs: run: | if [[ "$GITHUB_REF" != "refs/heads/release" ]]; then echo "===================================" - echo "[!] Can only release from the 'release' branches" + echo "[!] Can only release from the 'release' branch" echo "===================================" exit 1 fi