From a61ef748952135b7ece1c8584f5230d932ff37f1 Mon Sep 17 00:00:00 2001 From: Joseph Flinn <58369717+joseph-flinn@users.noreply.github.com> Date: Fri, 22 Oct 2021 08:41:15 -0700 Subject: [PATCH] Updating the release constraints (#1118) * updating the release constraints * removing the master branch release ci code execution * updating some verbiage --- .github/workflows/release.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 89017312d0..d764786a8b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,9 +13,9 @@ jobs: steps: - name: Branch check run: | - if [[ "$GITHUB_REF" != "refs/heads/rc" ]]; then + if [[ "$GITHUB_REF" != "refs/heads/release" ]]; then echo "===================================" - echo "[!] Can only release from rc branch" + echo "[!] Can only release from the 'release' branch" echo "===================================" exit 1 fi @@ -23,7 +23,7 @@ jobs: - name: Checkout repo uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 with: - ref: rc + ref: release - name: Get Package Version id: retrieve-version @@ -50,7 +50,7 @@ jobs: with: workflow: build.yml workflow_conclusion: success - branch: rc + branch: release - name: Create release uses: ncipollo/release-action@95215a3cb6e6a1908b3c44e00b4fdb15548b1e09 # v2.8.5 @@ -99,7 +99,7 @@ jobs: - name: Checkout Repo uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 with: - ref: rc + ref: release - name: Install Snap uses: samuelmeuli/action-snapcraft@10d7d0a84d9d86098b19f872257df314b0bd8e2d # v1.2.0 @@ -114,7 +114,7 @@ jobs: with: workflow: build.yml workflow_conclusion: success - branch: rc + branch: release artifacts: bitwarden_${{ env._PKG_VERSION }}_amd64.snap path: ./dist @@ -137,7 +137,7 @@ jobs: - name: Checkout Repo uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 with: - ref: rc + ref: release - name: Setup Chocolatey run: choco apikey --key $env:CHOCO_API_KEY --source https://push.chocolatey.org/ @@ -153,7 +153,7 @@ jobs: with: workflow: build.yml workflow_conclusion: success - branch: rc + branch: release artifacts: bitwarden.${{ env._PKG_VERSION }}.nupkg path: ./dist @@ -174,7 +174,7 @@ jobs: - name: Checkout repo uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 with: - ref: rc + ref: release - name: Make target directory run: mkdir -p dist/mas-universal @@ -184,7 +184,7 @@ jobs: with: workflow: build.yml workflow_conclusion: success - branch: rc + branch: release artifacts: Bitwarden-${{ env._PKG_VERSION }}-universal.pkg path: ./dist/mas-universal