Update workflows to new model (#379)

* Update GitHub Actions workflows to new model

.github/workflows/build.yml

@@ -22,10 +22,29 @@ jobs:
       - name: Print lines of code
         run: cloc --include-lang TypeScript,JavaScript --vcs git
 
+
+  setup:
+    name: Setup
+    runs-on: ubuntu-20.04
+    outputs:
+      package_version: ${{ steps.retrieve-version.outputs.package_version }}
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
+
+      - name: Get Package Version
+        id: retrieve-version
+        run: |
+          PKG_VERSION=$(jq -r .version package.json)
+          echo "::set-output name=package_version::$PKG_VERSION"
+
+
   cli:
     name: Build CLI
     runs-on: windows-2019
+    needs: setup
     env:
+      _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
       _WIN_PKG_FETCH_VERSION: 14.17.0
       _WIN_PKG_VERSION: 3.1
     steps:
@@ -40,18 +59,12 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@f1f314fca9dfce2769ece7d933488f076716723e  # v1.4.6
         with:
-          node-version: '14.x'
+          node-version: '14'
 
       - name: Update NPM
         run: |
           npm install -g npm@7
 
-      - name: Set PACKAGE_VERSION & VER_INFO
-        run: |
-          $env:pkgVersion = (Get-Content -Raw -Path .\package.json | ConvertFrom-Json).version
-          echo "PACKAGE_VERSION=$env:pkgVersion" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          echo "version: $env:pkgVersion"
-
       - name: Get pkg-fetch
         shell: pwsh
         run: |
@@ -60,11 +73,46 @@ jobs:
 
           New-Item -ItemType directory -Path .\.pkg-cache
           New-Item -ItemType directory -Path .\.pkg-cache\v$env:_WIN_PKG_VERSION
-          Invoke-RestMethod -Uri $fetchedUrl -OutFile ".\.pkg-cache\v$env:_WIN_PKG_VERSION\fetched-v$env:_WIN_PKG_FETCH_VERSION-win-x64"
+          Invoke-RestMethod -Uri $fetchedUrl `
+            -OutFile ".\.pkg-cache\v$env:_WIN_PKG_VERSION\fetched-v$env:_WIN_PKG_FETCH_VERSION-win-x64"
 
       - name: Setup Version Info
         shell: pwsh
-        run: ./scripts/make-versioninfo.ps1
+        run: |
+          $major,$minor,$patch = $env:_PACKAGE_VERSION.split('.')
+
+          $versionInfo = @"
+
+          1 VERSIONINFO
+          FILEVERSION $major,$minor,$patch,0
+          PRODUCTVERSION $major,$minor,$patch,0
+          FILEOS 0x40004
+          FILETYPE 0x1
+          {
+          BLOCK "StringFileInfo"
+          {
+            BLOCK "040904b0"
+            {
+              VALUE "CompanyName", "Bitwarden Inc."
+              VALUE "ProductName", "Bitwarden"
+              VALUE "FileDescription", "Bitwarden CLI"
+              VALUE "FileVersion", "$env:_PACKAGE_VERSION"
+              VALUE "ProductVersion", "$env:_PACKAGE_VERSION"
+              VALUE "OriginalFilename", "bw.exe"
+              VALUE "InternalName", "bw"
+              VALUE "LegalCopyright", "Copyright Bitwarden Inc."
+            }
+          }
+
+          BLOCK "VarFileInfo"
+          {
+            VALUE "Translation", 0x0409 0x04B0
+          }
+          }
+          "@
+
+          $versionInfo | Out-File ./version-info.rc
+
 
       # https://github.com/vercel/pkg-fetch/issues/188
       - name: Resource Hacker
@@ -95,110 +143,119 @@ jobs:
           Copy-Item dist/windows/bw.exe -Destination dist/chocolatey/tools
           Copy-Item LICENSE.txt -Destination dist/chocolatey/tools
 
-          choco pack dist/chocolatey/bitwarden-cli.nuspec --version ${{ env.PACKAGE_VERSION }} --out dist/chocolatey
+          choco pack dist/chocolatey/bitwarden-cli.nuspec --version ${{ env._PACKAGE_VERSION }} --out dist/chocolatey
 
       - name: Zip
         shell: cmd
         run: |
-          7z a ./dist/bw-windows-%PACKAGE_VERSION%.zip ./dist/windows/bw.exe
+          7z a ./dist/bw-windows-%_PACKAGE_VERSION%.zip ./dist/windows/bw.exe
-          7z a ./dist/bw-macos-%PACKAGE_VERSION%.zip ./dist/macos/bw
+          7z a ./dist/bw-macos-%_PACKAGE_VERSION%.zip ./dist/macos/bw
-          7z a ./dist/bw-linux-%PACKAGE_VERSION%.zip ./dist/linux/bw
+          7z a ./dist/bw-linux-%_PACKAGE_VERSION%.zip ./dist/linux/bw
 
       - name: Version Test
         run: |
           dir ./dist/
-          Expand-Archive -Path "./dist/bw-windows-${env:PACKAGE_VERSION}.zip" -DestinationPath "./test/windows"
+          Expand-Archive -Path "./dist/bw-windows-${env:_PACKAGE_VERSION}.zip" -DestinationPath "./test/windows"
           $testVersion = Invoke-Expression '& ./test/windows/bw.exe -v'
 
-          echo "version: $env:PACKAGE_VERSION"
+          echo "version: $env:_PACKAGE_VERSION"
           echo "testVersion: $testVersion"
-          if($testVersion -ne $env:PACKAGE_VERSION) {
+          if($testVersion -ne $env:_PACKAGE_VERSION) {
             Throw "Version test failed."
           }
 
       - name: Create checksums
         run: |
-          checksum -f="./dist/bw-windows-${env:PACKAGE_VERSION}.zip" `
+          checksum -f="./dist/bw-windows-${env:_PACKAGE_VERSION}.zip" `
-            -t sha256 | Out-File -Encoding ASCII ./dist/bw-windows-sha256-${env:PACKAGE_VERSION}.txt
+            -t sha256 | Out-File -Encoding ASCII ./dist/bw-windows-sha256-${env:_PACKAGE_VERSION}.txt
-          checksum -f="./dist/bw-macos-${env:PACKAGE_VERSION}.zip" `
+          checksum -f="./dist/bw-macos-${env:_PACKAGE_VERSION}.zip" `
-            -t sha256 | Out-File -Encoding ASCII ./dist/bw-macos-sha256-${env:PACKAGE_VERSION}.txt
+            -t sha256 | Out-File -Encoding ASCII ./dist/bw-macos-sha256-${env:_PACKAGE_VERSION}.txt
-          checksum -f="./dist/bw-linux-${env:PACKAGE_VERSION}.zip" `
+          checksum -f="./dist/bw-linux-${env:_PACKAGE_VERSION}.zip" `
-            -t sha256 | Out-File -Encoding ASCII ./dist/bw-linux-sha256-${env:PACKAGE_VERSION}.txt
+            -t sha256 | Out-File -Encoding ASCII ./dist/bw-linux-sha256-${env:_PACKAGE_VERSION}.txt
 
       - name: Upload windows zip asset
         uses: actions/upload-artifact@27121b0bdffd731efa15d66772be8dc71245d074  # v2.2.4
         with:
-          name: bw-windows-${{ env.PACKAGE_VERSION }}.zip
+          name: bw-windows-${{ env._PACKAGE_VERSION }}.zip
-          path: ./dist/bw-windows-${{ env.PACKAGE_VERSION }}.zip
+          path: ./dist/bw-windows-${{ env._PACKAGE_VERSION }}.zip
+          if-no-files-found: error
 
       - name: Upload windows checksum asset
         uses: actions/upload-artifact@27121b0bdffd731efa15d66772be8dc71245d074  # v2.2.4
         with:
-          name: bw-windows-sha256-${{ env.PACKAGE_VERSION }}.txt
+          name: bw-windows-sha256-${{ env._PACKAGE_VERSION }}.txt
-          path: ./dist/bw-windows-sha256-${{ env.PACKAGE_VERSION }}.txt
+          path: ./dist/bw-windows-sha256-${{ env._PACKAGE_VERSION }}.txt
+          if-no-files-found: error
 
       - name: Upload macos zip asset
         uses: actions/upload-artifact@27121b0bdffd731efa15d66772be8dc71245d074  # v2.2.4
         with:
-          name: bw-macos-${{ env.PACKAGE_VERSION }}.zip
+          name: bw-macos-${{ env._PACKAGE_VERSION }}.zip
-          path: ./dist/bw-macos-${{ env.PACKAGE_VERSION }}.zip
+          path: ./dist/bw-macos-${{ env._PACKAGE_VERSION }}.zip
+          if-no-files-found: error
 
       - name: Upload macos checksum asset
         uses: actions/upload-artifact@27121b0bdffd731efa15d66772be8dc71245d074  # v2.2.4
         with:
-          name: bw-macos-sha256-${{ env.PACKAGE_VERSION }}.txt
+          name: bw-macos-sha256-${{ env._PACKAGE_VERSION }}.txt
-          path: ./dist/bw-macos-sha256-${{ env.PACKAGE_VERSION }}.txt
+          path: ./dist/bw-macos-sha256-${{ env._PACKAGE_VERSION }}.txt
+          if-no-files-found: error
 
       - name: Upload linux zip asset
         uses: actions/upload-artifact@27121b0bdffd731efa15d66772be8dc71245d074  # v2.2.4
         with:
-          name: bw-linux-${{ env.PACKAGE_VERSION }}.zip
+          name: bw-linux-${{ env._PACKAGE_VERSION }}.zip
-          path: ./dist/bw-linux-${{ env.PACKAGE_VERSION }}.zip
+          path: ./dist/bw-linux-${{ env._PACKAGE_VERSION }}.zip
+          if-no-files-found: error
 
       - name: Upload linux checksum asset
         uses: actions/upload-artifact@27121b0bdffd731efa15d66772be8dc71245d074  # v2.2.4
         with:
-          name: bw-linux-sha256-${{ env.PACKAGE_VERSION }}.txt
+          name: bw-linux-sha256-${{ env._PACKAGE_VERSION }}.txt
-          path: ./dist/bw-linux-sha256-${{ env.PACKAGE_VERSION }}.txt
+          path: ./dist/bw-linux-sha256-${{ env._PACKAGE_VERSION }}.txt
+          if-no-files-found: error
 
       - name: Upload Chocolatey asset
         uses: actions/upload-artifact@27121b0bdffd731efa15d66772be8dc71245d074  # v2.2.4
         with:
-          name: bitwarden-cli.${{ env.PACKAGE_VERSION }}.nupkg
+          name: bitwarden-cli.${{ env._PACKAGE_VERSION }}.nupkg
-          path: ./dist/chocolatey/bitwarden-cli.${{ env.PACKAGE_VERSION }}.nupkg
+          path: ./dist/chocolatey/bitwarden-cli.${{ env._PACKAGE_VERSION }}.nupkg
+          if-no-files-found: error
 
+      - name: Upload NPM Build Directory asset
+        uses: actions/upload-artifact@27121b0bdffd731efa15d66772be8dc71245d074  # v2.2.4
+        with:
+          name: bitwarden-cli-${{ env._PACKAGE_VERSION }}-npm-build.zip
+          path: ./build
+          if-no-files-found: error
 
   snap:
     name: Build Snap
     runs-on: ubuntu-20.04
-    needs: cli
+    needs: [setup, cli]
+    env:
+      _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
 
-      - name: Set PACKAGE_VERSION
-        shell: pwsh
-        run: |
-          $env:pkgVersion = (Get-Content -Raw -Path ./package.json | ConvertFrom-Json).version
-          echo "PACKAGE_VERSION=$env:pkgVersion" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-
       - name: Print environment
         run: |
           whoami
           echo "GitHub ref: $GITHUB_REF"
           echo "GitHub event: $GITHUB_EVENT"
-          echo "BW Package Version: $PACKAGE_VERSION"
+          echo "BW Package Version: $_PACKAGE_VERSION"
 
       - name: Get bw linux cli
         uses: actions/download-artifact@3be87be14a055c47b01d3bd88f8fe02320a9bb60  # v2.0.10
         with:
-          name: bw-linux-${{ env.PACKAGE_VERSION }}.zip
+          name: bw-linux-${{ env._PACKAGE_VERSION }}.zip
           path: ./dist/snap
 
       - name: Setup Snap Package
         run: |
           cp -r stores/snap/* -t dist/snap
-          sed -i s/__version__/${{ env.PACKAGE_VERSION }}/g dist/snap/snapcraft.yaml
+          sed -i s/__version__/${{ env._PACKAGE_VERSION }}/g dist/snap/snapcraft.yaml
 
           cd dist/snap
           ls -alth
@@ -212,8 +269,8 @@ jobs:
         run: |
           cd dist/snap
           ls -alth
-          sha256sum bw_${{ env.PACKAGE_VERSION }}_amd64.snap \
+          sha256sum bw_${{ env._PACKAGE_VERSION }}_amd64.snap \
-            | awk '{split($0, a); print a[1]}' > bw-snap-sha256-${{ env.PACKAGE_VERSION }}.txt
+            | awk '{split($0, a); print a[1]}' > bw-snap-sha256-${{ env._PACKAGE_VERSION }}.txt
 
       - name: Install Snap
         run: sudo snap install dist/snap/bw*.snap --dangerous
@@ -222,7 +279,7 @@ jobs:
         shell: pwsh
         run: |
           $testVersion = Invoke-Expression '& bw -v'
-          if($testVersion -ne $env:PACKAGE_VERSION) {
+          if($testVersion -ne $env:_PACKAGE_VERSION) {
             Throw "Version test failed."
           }
         env:
@@ -236,11 +293,13 @@ jobs:
       - name: Upload snap asset
         uses: actions/upload-artifact@27121b0bdffd731efa15d66772be8dc71245d074  # v2.2.4
         with:
-          name: bw_${{ env.PACKAGE_VERSION }}_amd64.snap
+          name: bw_${{ env._PACKAGE_VERSION }}_amd64.snap
-          path: ./dist/snap/bw_${{ env.PACKAGE_VERSION }}_amd64.snap
+          path: ./dist/snap/bw_${{ env._PACKAGE_VERSION }}_amd64.snap
+          if-no-files-found: error
 
       - name: Upload snap checksum asset
         uses: actions/upload-artifact@27121b0bdffd731efa15d66772be8dc71245d074  # v2.2.4
         with:
-          name: bw-snap-sha256-${{ env.PACKAGE_VERSION }}.txt
+          name: bw-snap-sha256-${{ env._PACKAGE_VERSION }}.txt
-          path: ./dist/snap/bw-snap-sha256-${{ env.PACKAGE_VERSION }}.txt
+          path: ./dist/snap/bw-snap-sha256-${{ env._PACKAGE_VERSION }}.txt
+          if-no-files-found: error

.github/workflows/deploy.yml

@@ -1,156 +0,0 @@
----
-name: Deploy
-
-on:
-  workflow_dispatch:
-    inputs:
-      release_tag_name_input:
-        description: "Release Tag Name <X.X.X>"
-        required: true
-  release:
-    types:
-      - published
-
-
-jobs:
-  setup:
-    name: Setup
-    runs-on: ubuntu-20.04
-    outputs:
-      package_version: ${{ steps.create_tags.outputs.package_version }}
-      tag_version: ${{ steps.create_tags.outputs.tag_version }}
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
-        with:
-          ref: 'rc'
-
-      - name: Create Deploy version vars
-        id: create_tags
-        run: |
-          if [ "${{ github.event_name }}" != "release" ]; then
-            case "${RELEASE_TAG_NAME_INPUT:0:1}" in
-              v)
-                echo "RELEASE_NAME=${RELEASE_TAG_NAME_INPUT:1}" >> $GITHUB_ENV
-                echo "RELEASE_TAG_NAME=$RELEASE_TAG_NAME_INPUT" >> $GITHUB_ENV
-                echo "::set-output name=package_version::${RELEASE_TAG_NAME_INPUT:1}"
-                echo "::set-output name=tag_version::$RELEASE_TAG_NAME_INPUT"
-                ;;
-              [0-9])
-                echo "RELEASE_NAME=$RELEASE_TAG_NAME_INPUT" >> $GITHUB_ENV
-                echo "RELEASE_TAG_NAME=v$RELEASE_TAG_NAME_INPUT" >> $GITHUB_ENV
-                echo "::set-output name=package_version::$RELEASE_TAG_NAME_INPUT"
-                echo "::set-output name=tag_version::v$RELEASE_TAG_NAME_INPUT"
-                ;;
-              *)
-                exit 1
-                ;;
-            esac
-          else
-            TAG_VERSION=$(echo ${{ github.ref }} | cut -d "/" -f 3)
-            PKG_VERSION=${TAG_VERSION:1}
-
-            echo "::set-output name=package_version::$PKG_VERSION"
-            echo "::set-output name=tag_version::$TAG_VERSION"
-          fi
-        env:
-          RELEASE_TAG_NAME_INPUT: ${{ github.event.inputs.release_tag_name_input }}
-
-
-  snap:
-    name: Deploy Snap
-    runs-on: ubuntu-20.04
-    needs: setup
-    env:
-      _PKG_VERSION: ${{ needs.setup.outputs.package_version }}
-      _TAG_VERSION: ${{ needs.setup.outputs.tag_version }}
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
-
-      - name: Install Snapcraft
-        uses: samuelmeuli/action-snapcraft@10d7d0a84d9d86098b19f872257df314b0bd8e2d  # v1.2.0
-        with:
-          snapcraft_token: ${{ secrets.SNAP_TOKEN }}
-
-      - name: Setup
-        run: mkdir dist
-
-      - name: Get snap release assets
-        uses: Xotl/cool-github-releases@16c58a5863d6ba9944f63ca8bb78bb3249ce1d81  # v1.1.6
-        with:
-          mode: download
-          tag_name: ${{ env._TAG_VERSION }}
-          assets: bw_${{ env._PKG_VERSION }}_amd64.snap|./dist/bw_${{ env._PKG_VERSION }}_amd64.snap
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Test
-        run: ls -alht dist
-
-      - name: Publish Snap & logout
-        run: |
-          snapcraft push ./dist/bw_${{ env._PKG_VERSION }}_amd64.snap --release stable
-          snapcraft logout
-
-
-  choco:
-    name: Deploy Choco
-    runs-on: windows-2019
-    needs: setup
-    env:
-      _PKG_VERSION: ${{ needs.setup.outputs.package_version }}
-      _TAG_VERSION: ${{ needs.setup.outputs.tag_version }}
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
-        with:
-          ref: 'rc'
-
-      - name: Setup Chocolatey
-        run: choco apikey --key $env:CHOCO_API_KEY --source https://push.chocolatey.org/
-        env:
-          CHOCO_API_KEY: ${{ secrets.CHOCO_API_KEY }}
-
-      - name: Make dist dir
-        shell: pwsh
-        run: New-Item -ItemType directory -Path ./dist
-
-      - name: Get nupkg release asset
-        uses: Xotl/cool-github-releases@16c58a5863d6ba9944f63ca8bb78bb3249ce1d81  # v1.1.6
-        with:
-          mode: download
-          tag_name: ${{ env._TAG_VERSION }}
-          assets: bitwarden-cli.${{ env._PKG_VERSION }}.nupkg|./dist/bitwarden-cli.${{ env._PKG_VERSION }}.nupkg
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Push to Chocolatey
-        shell: pwsh
-        run: |
-          cd dist
-          choco push
-
-
-  npm:
-    name: Publish NPM
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
-        with:
-          ref: 'rc'
-
-      - name: Setup NPM
-        shell: pwsh
-        run: |
-          "//registry.npmjs.org/:_authToken=${env:NPM_TOKEN}" | Out-File ".npmrc" -Encoding UTF8
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-
-      - name: Setup sub-module
-        run: npm run sub:init
-
-      - name: NPM install
-        run: npm install
-
-      - name: Publish NPM
-        run: npm run publish:npm

.github/workflows/release.yml

@@ -3,20 +3,13 @@ name: Release
 
 on:
   workflow_dispatch:
-    inputs:
-      release_tag_name_input:
-        description: "Release Tag Name <X.X.X>"
-        required: true
-
 
 jobs:
   setup:
     name: Setup
     runs-on: ubuntu-20.04
     outputs:
-      release_upload_url: ${{ steps.create_release.outputs.upload_url }}
+      package_version: ${{ steps.retrieve-version.outputs.package_version }}
-      package_version: ${{ steps.create_tags.outputs.package_version }}
-      tag_version: ${{ steps.create_tags.outputs.tag_version }}
     steps:
       - name: Branch check
         run: |
@@ -29,312 +22,146 @@ jobs:
 
       - name: Checkout repo
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # 2.3.4
+        with:
+          ref: rc
 
-      - name: Create Release Vars
+      - name: Retrieve CLI release version
-        id: create_tags
+        id: retrieve-version
         run: |
-          case "${RELEASE_TAG_NAME_INPUT:0:1}" in
+          PKG_VERSION=$(jq -r .version package.json)
-            v)
+          echo "::set-output name=package_version::$PKG_VERSION"
-              echo "RELEASE_NAME=${RELEASE_TAG_NAME_INPUT:1}" >> $GITHUB_ENV
-              echo "RELEASE_TAG_NAME=$RELEASE_TAG_NAME_INPUT" >> $GITHUB_ENV
-              echo "::set-output name=package_version::${RELEASE_TAG_NAME_INPUT:1}"
-              echo "::set-output name=tag_version::$RELEASE_TAG_NAME_INPUT"
-              ;;
-            [0-9])
-              echo "RELEASE_NAME=$RELEASE_TAG_NAME_INPUT" >> $GITHUB_ENV
-              echo "RELEASE_TAG_NAME=v$RELEASE_TAG_NAME_INPUT" >> $GITHUB_ENV
-              echo "::set-output name=package_version::$RELEASE_TAG_NAME_INPUT"
-              echo "::set-output name=tag_version::v$RELEASE_TAG_NAME_INPUT"
-              ;;
-            *)
-              exit 1
-              ;;
-          esac
-        env:
-          RELEASE_TAG_NAME_INPUT: ${{ github.event.inputs.release_tag_name_input }}
 
-      - name: Create Draft Release
+      - name: Check to make sure CLI release version has been bumped
-        id: create_release
-        uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e  # 1.1.4 - Repo Archived
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          latest_ver=$(hub release -L 1 -f '%T')
+          latest_ver=${latest_ver:1}
+          echo "Latest version: $latest_ver"
+          ver=${{ steps.retrieve-version.outputs.package_version }}
+          echo "Version: $ver"
+          if [ "$latest_ver" = "$ver" ]; then
+            echo "Version has not been bumped!"
+            exit 1
+          fi
+        shell: bash
+
+      - name: Download all artifacts
+        uses: bitwarden/gh-actions/download-artifacts@23433be15ed6fd046ce12b6889c5184a8d9c8783
         with:
-          tag_name: ${{ env.RELEASE_TAG_NAME }}
+          workflow: build.yml
-          release_name: Version ${{ env.RELEASE_NAME }}
+          workflow_conclusion: success
+          branch: rc
+
+      - name: Create release
+        uses: ncipollo/release-action@95215a3cb6e6a1908b3c44e00b4fdb15548b1e09  # v2.8.5
+        env:
+          PKG_VERSION: ${{ steps.retrieve-version.outputs.package_version }}
+        with:
+          artifacts: "bw-windows-${{ env.PKG_VERSION }}.zip,
+                      bw-windows-sha256-${{ env.PKG_VERSION }}.txt,
+                      bw-macos-${{ env.PKG_VERSION }}.zip,
+                      bw-macos-sha256-${{ env.PKG_VERSION }}.txt,
+                      bw-linux-${{ env.PKG_VERSION }}.zip,
+                      bw-linux-sha256-${{ env.PKG_VERSION }}.txt,
+                      bitwarden-cli.${{ env.PKG_VERSION }}.nupkg,
+                      bw_${{ env.PKG_VERSION }}_amd64.snap,
+                      bw-snap-sha256-${{ env.PKG_VERSION }}.txt"
+          commit: ${{ github.sha }}
+          tag: v${{ env.PKG_VERSION }}
+          name: Version ${{ env.PKG_VERSION }}
+          body: "<insert release notes here>"
+          token: ${{ secrets.GITHUB_TOKEN }}
           draft: true
-          prerelease: false
-
-
-  cli:
-    name: Build CLI
-    runs-on: windows-2019
-    needs: setup
-    env:
-      _WIN_PKG_FETCH_VERSION: 14.17.0
-      _WIN_PKG_VERSION: 3.1
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # 2.3.4
-
-      - name: Setup Windows builder
-        run: |
-          choco install checksum --no-progress
-          choco install reshack --no-progress
-
-      - name: Set up Node
-        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea  # 2.1.5
-        with:
-          node-version: '14.x'
-
-      - name: Update NPM
-        run: |
-          npm install -g npm@7
-
-      - name: Set PACKAGE_VERSION & VER_INFO
-        run: |
-          $env:pkgVersion = (Get-Content -Raw -Path .\package.json | ConvertFrom-Json).version
-          echo "PACKAGE_VERSION=$env:pkgVersion" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          echo "version: $env:pkgVersion"
-
-      - name: Get pkg-fetch
-        shell: pwsh
-        run: |
-          cd $HOME
-          $fetchedUrl = "https://github.com/vercel/pkg-fetch/releases/download/v$env:_WIN_PKG_VERSION/node-v$env:_WIN_PKG_FETCH_VERSION-win-x64"
-
-          New-Item -ItemType directory -Path .\.pkg-cache
-          New-Item -ItemType directory -Path .\.pkg-cache\v$env:_WIN_PKG_VERSION
-          Invoke-RestMethod -Uri $fetchedUrl -OutFile ".\.pkg-cache\v$env:_WIN_PKG_VERSION\fetched-v$env:_WIN_PKG_FETCH_VERSION-win-x64"
-
-      - name: Setup Version Info
-        shell: pwsh
-        run: ./scripts/make-versioninfo.ps1
-
-      # https://github.com/vercel/pkg-fetch/issues/188
-      - name: Resource Hacker
-        shell: cmd
-        run: |
-          set PATH=%PATH%;C:\Program Files (x86)\Resource Hacker
-          set WIN_PKG=C:\Users\runneradmin\.pkg-cache\v%_WIN_PKG_VERSION%\fetched-v%_WIN_PKG_FETCH_VERSION%-win-x64
-          set WIN_PKG_BUILT=C:\Users\runneradmin\.pkg-cache\v%_WIN_PKG_VERSION%\built-v%_WIN_PKG_FETCH_VERSION%-win-x64
-
-          copy %WIN_PKG% %WIN_PKG_BUILT%
-          ResourceHacker -open %WIN_PKG_BUILT% -save %WIN_PKG_BUILT% -action delete -mask ICONGROUP,1,
-          ResourceHacker -open version-info.rc -save version-info.res -action compile
-          ResourceHacker -open %WIN_PKG_BUILT% -save %WIN_PKG_BUILT% -action addoverwrite -resource version-info.res
-
-      - name: Setup sub-module
-        run: npm run sub:init
-
-      - name: Install
-        run: npm install
-
-      - name: Build & Package
-        run: npm run dist
-
-      - name: Package Chocolatey
-        shell: pwsh
-        run: |
-          Copy-Item -Path stores/chocolatey -Destination dist/chocolatey -Recurse
-          Copy-Item dist/windows/bw.exe -Destination dist/chocolatey/tools
-          Copy-Item LICENSE.txt -Destination dist/chocolatey/tools
-
-          choco pack dist/chocolatey/bitwarden-cli.nuspec --version ${{ env.PACKAGE_VERSION }} --out dist/chocolatey
-
-      - name: Zip
-        shell: cmd
-        run: |
-          7z a ./dist/bw-windows-%PACKAGE_VERSION%.zip ./dist/windows/bw.exe
-          7z a ./dist/bw-macos-%PACKAGE_VERSION%.zip ./dist/macos/bw
-          7z a ./dist/bw-linux-%PACKAGE_VERSION%.zip ./dist/linux/bw
-
-      - name: Version Test
-        run: |
-          dir ./dist/
-          Expand-Archive -Path "./dist/bw-windows-${env:PACKAGE_VERSION}.zip" -DestinationPath "./test/windows"
-          $testVersion = Invoke-Expression '& ./test/windows/bw.exe -v'
-
-          echo "version: $env:PACKAGE_VERSION"
-          echo "testVersion: $testVersion"
-          if($testVersion -ne $env:PACKAGE_VERSION) {
-            Throw "Version test failed."
-          }
-
-      - name: Create checksums
-        run: |
-          checksum -f="./dist/bw-windows-${env:PACKAGE_VERSION}.zip" `
-            -t sha256 | Out-File -Encoding ASCII ./dist/bw-windows-sha256-${env:PACKAGE_VERSION}.txt
-          checksum -f="./dist/bw-macos-${env:PACKAGE_VERSION}.zip" `
-            -t sha256 | Out-File -Encoding ASCII ./dist/bw-macos-sha256-${env:PACKAGE_VERSION}.txt
-          checksum -f="./dist/bw-linux-${env:PACKAGE_VERSION}.zip" `
-            -t sha256 | Out-File -Encoding ASCII ./dist/bw-linux-sha256-${env:PACKAGE_VERSION}.txt
-
-      - name: Build artifact - linux zip
-        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700  # 2.2.3
-        with:
-          name: bw-linux-${{ env.PACKAGE_VERSION }}.zip
-          path: ./dist/bw-linux-${{ env.PACKAGE_VERSION }}.zip
-
-      - name: Upload windows zip release asset
-        id: upload-windows-zip
-        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5  # 1.0.2 - Archived
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.setup.outputs.release_upload_url }}
-          asset_name: bw-windows-${{ env.PACKAGE_VERSION }}.zip
-          asset_path: ./dist/bw-windows-${{ env.PACKAGE_VERSION }}.zip
-          asset_content_type: application/zip
-
-      - name: Upload macos zip release asset
-        id: upload-macos-zip
-        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5  # 1.0.2 - Archived
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.setup.outputs.release_upload_url }}
-          asset_name: bw-macos-${{ env.PACKAGE_VERSION }}.zip
-          asset_path: ./dist/bw-macos-${{ env.PACKAGE_VERSION }}.zip
-          asset_content_type: application/zip
-
-      - name: Upload linux zip release asset
-        id: upload-linux-zip
-        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5  # 1.0.2 - Archived
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.setup.outputs.release_upload_url }}
-          asset_name: bw-linux-${{ env.PACKAGE_VERSION }}.zip
-          asset_path: ./dist/bw-linux-${{ env.PACKAGE_VERSION }}.zip
-          asset_content_type: application/zip
-
-      - name: Upload windows checksum release asset
-        id: upload-windows-checksum
-        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5  # 1.0.2 - Archived
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.setup.outputs.release_upload_url }}
-          asset_name: bw-windows-sha256-${{ env.PACKAGE_VERSION }}.txt
-          asset_path: ./dist/bw-windows-sha256-${{ env.PACKAGE_VERSION }}.txt
-          asset_content_type: plain/text
-
-      - name: Upload macos checksum release asset
-        id: upload-macos-checksum
-        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5  # 1.0.2 - Archived
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.setup.outputs.release_upload_url }}
-          asset_name: bw-macos-sha256-${{ env.PACKAGE_VERSION }}.txt
-          asset_path: ./dist/bw-macos-sha256-${{ env.PACKAGE_VERSION }}.txt
-          asset_content_type: plain/text
-
-      - name: Upload linux checksum release asset
-        id: upload-linux-checksum
-        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5  # 1.0.2 - Archived
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.setup.outputs.release_upload_url }}
-          asset_name: bw-linux-sha256-${{ env.PACKAGE_VERSION }}.txt
-          asset_path: ./dist/bw-linux-sha256-${{ env.PACKAGE_VERSION }}.txt
-          asset_content_type: plain/text
-
-      - name: Upload chocolatey nupkg release asset
-        id: upload-choco-nupkg
-        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5  # 1.0.2 - Archived
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.setup.outputs.release_upload_url }}
-          asset_name: bitwarden-cli.${{ env.PACKAGE_VERSION }}.nupkg
-          asset_path: ./dist/chocolatey/bitwarden-cli.${{ env.PACKAGE_VERSION }}.nupkg
-          asset_content_type: application
 
 
   snap:
-    name: Release Snap
+    name: Deploy Snap
     runs-on: ubuntu-20.04
-    needs:
+    needs: setup
-      - setup
-      - cli
     env:
-      _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
+      _PKG_VERSION: ${{ needs.setup.outputs.package_version }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # 2.3.4
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
+        with:
+          ref: 'rc'
 
-      - name: Print environment
+      - name: Install Snapcraft
+        uses: samuelmeuli/action-snapcraft@10d7d0a84d9d86098b19f872257df314b0bd8e2d  # v1.2.0
+        with:
+          snapcraft_token: ${{ secrets.SNAP_TOKEN }}
+
+      - name: Download artifacts
+        uses: bitwarden/gh-actions/download-artifacts@23433be15ed6fd046ce12b6889c5184a8d9c8783
+        with:
+          workflow: build.yml
+          workflow_conclusion: success
+          branch: rc
+          artifacts: bw_${{ env._PKG_VERSION }}_amd64.snap
+
+      - name: Test
+        run: ls -alht
+
+      - name: Publish Snap & logout
         run: |
-          whoami
+          snapcraft push bw_${{ env._PKG_VERSION }}_amd64.snap --release stable
-          echo "GitHub ref: $GITHUB_REF"
+          snapcraft logout
-          echo "GitHub event: $GITHUB_EVENT"
+
-          echo "BW Package Version: $_PACKAGE_VERSION"
+
+  choco:
+    name: Deploy Choco
+    runs-on: windows-2019
+    needs: setup
+    env:
+      _PKG_VERSION: ${{ needs.setup.outputs.package_version }}
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
+        with:
+          ref: 'rc'
+
+      - name: Setup Chocolatey
+        run: choco apikey --key $env:CHOCO_API_KEY --source https://push.chocolatey.org/
         env:
-          GITHUB_REF: ${{ github.ref }}
+          CHOCO_API_KEY: ${{ secrets.CHOCO_API_KEY }}
-          GITHUB_EVENT: ${{ github.event_name }}
 
-      - name: Get linux zip artifact
+      - name: Download artifacts
-        uses: actions/download-artifact@158ca71f7c614ae705e79f25522ef4658df18253  # 2.0.9
+        uses: bitwarden/gh-actions/download-artifacts@23433be15ed6fd046ce12b6889c5184a8d9c8783
         with:
-          name: bw-linux-${{ env._PACKAGE_VERSION }}.zip
+          workflow: build.yml
-          path: ./dist/snap
+          workflow_conclusion: success
+          branch: rc
+          artifacts: bitwarden-cli.${{ env._PKG_VERSION }}.nupkg
 
-      - name: Setup Snap Package
+      - name: Push to Chocolatey
-        run: |
-          cp -r stores/snap/* -t dist/snap
-          sed -i s/__version__/${{ env._PACKAGE_VERSION }}/g dist/snap/snapcraft.yaml
-
-          cd dist/snap
-          ls -alth
-
-      - name: Build snap
-        uses: snapcore/action-build@a400bf1c2d0f23074aaacf08a144813c3c20b35d  # v1.0.9
-        with:
-          path: dist/snap
-
-      - name: Create checksum
-        run: |
-          cd dist/snap
-          ls -alth
-          sha256sum bw_${{ env._PACKAGE_VERSION }}_amd64.snap \
-            | awk '{split($0, a); print a[1]}' > bw-snap-sha256-${{ env._PACKAGE_VERSION }}.txt
-
-      - name: Install Snap
-        run: sudo snap install ./dist/snap/bw*.snap --dangerous
-
-      - name: Test Snap
         shell: pwsh
-        run: |
+        run: choco push
-          $testVersion = Invoke-Expression '& bw -v'
-          if($testVersion -ne $env:_PACKAGE_VERSION) {
-            Throw "Version test failed."
-          }
-        env:
-          BITWARDENCLI_APPDATA_DIR: "/home/runner/snap/bw/x1/.config/Bitwarden CLI"
 
-      - name: Cleanup Test & Update Snap for Publish
-        shell: pwsh
-        run: |
-          sudo snap remove bw
 
-      - name: Upload snap release asset
+  npm:
-        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5  # 1.0.2 - Archived
+    name: Publish NPM
-        env:
+    runs-on: ubuntu-20.04
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    needs: setup
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
         with:
-          upload_url: ${{ needs.setup.outputs.release_upload_url }}
+          ref: 'rc'
-          asset_name: bw_${{ env._PACKAGE_VERSION }}_amd64.snap
-          asset_path: ./dist/snap/bw_${{ env._PACKAGE_VERSION }}_amd64.snap
-          asset_content_type: application
 
-      - name: Upload snap checksum release asset
+      - name: Download artifacts
-        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5  # 1.0.2 - Archived
+        uses: bitwarden/gh-actions/download-artifacts@23433be15ed6fd046ce12b6889c5184a8d9c8783
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ needs.setup.outputs.release_upload_url }}
+          workflow: build.yml
-          asset_name: bw-snap-sha256-${{ env._PACKAGE_VERSION }}.txt
+          workflow_conclusion: success
-          asset_path: ./dist/snap/bw-snap-sha256-${{ env._PACKAGE_VERSION }}.txt
+          branch: rc
-          asset_content_type: plain/text
+          artifacts: bitwarden-cli-${{ env._PACKAGE_VERSION }}-npm-build.zip
+
+      - name: Setup NPM
+        run: |
+          echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > .npmrc
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+      - name: Publish NPM
+        run: npm publish --access public

scripts/make-versioninfo.ps1

@@ -1,33 +0,0 @@
-$major,$minor,$patch = $env:PACKAGE_VERSION.split('.')
-
-$versionInfo = @"
-
-1 VERSIONINFO
-FILEVERSION $major,$minor,$patch,0
-PRODUCTVERSION $major,$minor,$patch,0
-FILEOS 0x40004
-FILETYPE 0x1
-{
-BLOCK "StringFileInfo"
-{
-	BLOCK "040904b0"
-	{
-		VALUE "CompanyName", "Bitwarden Inc."
-		VALUE "ProductName", "Bitwarden"
-		VALUE "FileDescription", "Bitwarden CLI"
-		VALUE "FileVersion", "$env:PACKAGE_VERSION"
-		VALUE "ProductVersion", "$env:PACKAGE_VERSION"
-		VALUE "OriginalFilename", "bw.exe"
-		VALUE "InternalName", "bw"
-		VALUE "LegalCopyright", "Copyright Bitwarden Inc."
-	}
-}
-
-BLOCK "VarFileInfo"
-{
-	VALUE "Translation", 0x0409 0x04B0  
-}
-}
-"@
-
-$versionInfo | Out-File ./version-info.rc