From 7310fa826edbcea6ebe9b2173fa303cb10d55755 Mon Sep 17 00:00:00 2001 From: Vince Grassia <593223+vgrassia@users.noreply.github.com> Date: Mon, 20 Jun 2022 12:23:11 -0400 Subject: [PATCH] Add Brew Bump Workflows (#2934) --- .github/workflows/brew-bump-cli.yml | 42 +++++++++++++++++++++++++ .github/workflows/brew-bump-desktop.yml | 42 +++++++++++++++++++++++++ .github/workflows/build-browser.yml | 4 +-- .github/workflows/build-web.yml | 5 ++- .github/workflows/chromatic.yml | 4 +-- .github/workflows/version-bump.yml | 2 +- 6 files changed, 93 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/brew-bump-cli.yml create mode 100644 .github/workflows/brew-bump-desktop.yml diff --git a/.github/workflows/brew-bump-cli.yml b/.github/workflows/brew-bump-cli.yml new file mode 100644 index 0000000000..8c77f601a5 --- /dev/null +++ b/.github/workflows/brew-bump-cli.yml @@ -0,0 +1,42 @@ +--- +name: Bump CLI Formula + +on: + push: + tags: + - cli-v** + workflow_dispatch: + +defaults: + run: + shell: bash + +jobs: + update-desktop-cask: + name: Update Bitwarden CLI Formula + runs-on: macos-11 + steps: + - name: Login to Azure + uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf + with: + creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }} + + - name: Retrieve secrets + id: retrieve-secrets + uses: Azure/get-keyvault-secrets@b5c723b9ac7870c022b8c35befe620b7009b336f + with: + keyvault: "bitwarden-prod-kv" + secrets: "brew-bump-workflow-pat" + + - name: Update Homebrew formula + uses: dawidd6/action-homebrew-bump-formula@dd221ff435f42fa8102b5871bb1929af9d76476c + with: + # Required, custom GitHub access token with the 'public_repo' and 'workflow' scopes + token: ${{ steps.retrieve-secrets.outputs.brew-bump-workflow-pat }} + org: bitwarden + tap: Homebrew/homebrew-core + cask: bitwarden-cli + tag: ${{ github.ref }} + revision: ${{ github.sha }} + force: false + dryrun: true diff --git a/.github/workflows/brew-bump-desktop.yml b/.github/workflows/brew-bump-desktop.yml new file mode 100644 index 0000000000..4b62b1213c --- /dev/null +++ b/.github/workflows/brew-bump-desktop.yml @@ -0,0 +1,42 @@ +--- +name: Bump Desktop Cask + +on: + push: + tags: + - desktop-v** + workflow_dispatch: + +defaults: + run: + shell: bash + +jobs: + update-desktop-cask: + name: Update Bitwarden Desktop Cask + runs-on: macos-11 + steps: + - name: Login to Azure + uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf + with: + creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }} + + - name: Retrieve secrets + id: retrieve-secrets + uses: Azure/get-keyvault-secrets@b5c723b9ac7870c022b8c35befe620b7009b336f + with: + keyvault: "bitwarden-prod-kv" + secrets: "brew-bump-workflow-pat" + + - name: Update Homebrew cask + uses: macauley/action-homebrew-bump-cask@445c42390d790569d938f9068d01af39ca030feb + with: + # Required, custom GitHub access token with the 'public_repo' and 'workflow' scopes + token: ${{ steps.retrieve-secrets.outputs.brew-bump-workflow-pat }} + org: bitwarden + tap: Homebrew/homebrew-cask + cask: bitwarden + tag: ${{ github.ref }} + revision: ${{ github.sha }} + force: false + dryrun: true diff --git a/.github/workflows/build-browser.yml b/.github/workflows/build-browser.yml index af4a0b0dc9..44e75de64b 100644 --- a/.github/workflows/build-browser.yml +++ b/.github/workflows/build-browser.yml @@ -159,7 +159,7 @@ jobs: REM Copy apps\browser to Browser source directory mkdir browser-source\apps\browser xcopy apps\browser\* browser-source\apps\browser /E - + REM Copy libs to Browser source directory mkdir browser-source\libs xcopy libs\* browser-source\libs /E @@ -408,7 +408,7 @@ jobs: BUILD_STATUS: ${{ needs.build.result }} SAFARI_BUILD_STATUS: ${{ needs.build-safari.result }} CROWDIN_PUSH_STATUS: ${{ needs.crowdin-push.result }} - TRIGGER_DESKTOP_BUILD_STATUS: ${{ needs.trigger-desktop-build.result }} + TRIGGER_DESKTOP_BUILD_STATUS: ${{ needs.trigger-desktop-build.result }} run: | if [ "$CLOC_STATUS" = "failure" ]; then exit 1 diff --git a/.github/workflows/build-web.yml b/.github/workflows/build-web.yml index f5589f8c46..0c1ad68dac 100644 --- a/.github/workflows/build-web.yml +++ b/.github/workflows/build-web.yml @@ -26,7 +26,10 @@ on: - '!*.txt' - '.github/workflows/build-web.yml' workflow_dispatch: - inputs: {} + inputs: + custom_tag_extension: + description: "Custom image tag extension" + required: false jobs: cloc: diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml index 1cc1d45293..7983a1ad90 100644 --- a/.github/workflows/chromatic.yml +++ b/.github/workflows/chromatic.yml @@ -10,12 +10,12 @@ jobs: steps: - name: Set up Node - uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5 + uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5 with: node-version: "16" - name: Checkout repo - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 + uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 with: fetch-depth: 0 diff --git a/.github/workflows/version-bump.yml b/.github/workflows/version-bump.yml index 3d293c8466..8c657475b4 100644 --- a/.github/workflows/version-bump.yml +++ b/.github/workflows/version-bump.yml @@ -36,7 +36,7 @@ jobs: run: | CLIENT=$(python -c "print('$CLIENT_NAME'.lower())") echo "::set-output name=client::$CLIENT" - + git switch -c ${CLIENT}_version_bump_${{ github.event.inputs.version_number }} git push -u origin ${CLIENT}_version_bump_${{ github.event.inputs.version_number }}