Update pipelines (#936)

* Update workflows for consistency

* Update pipelines

- Trigger deploy workflow manually
- Publish release draft at the end of deploy workflow

* Enable artifact uploads for all branches and fail if no asset is found during upload

* Add if statements back in for MacOS

* Change Build application (dev) step

.github/workflows/build.yml

@@ -7,10 +7,9 @@ on:
       - 'gh-pages'
 
 jobs:
-
   cloc:
+    name: CLOC
     runs-on: ubuntu-latest
-
     steps:
       - name: Checkout repo
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
@@ -24,8 +23,8 @@ jobs:
         run: cloc --include-lang TypeScript,JavaScript,HTML,Sass,CSS --vcs git
 
   linux:
+    name: Linux
     runs-on: ubuntu-latest
-
     steps:
       - name: Set up Node
         uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
@@ -74,42 +73,43 @@ jobs:
         run: npm run dist:lin
 
       - name: Upload .deb artifact
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
         uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
         with:
           name: Bitwarden-${{ env.PACKAGE_VERSION }}-amd64.deb
           path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-amd64.deb
+          if-no-files-found: error
 
       - name: Upload .rpm artifact
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
         uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
         with:
           name: Bitwarden-${{ env.PACKAGE_VERSION }}-x86_64.rpm
           path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x86_64.rpm
+          if-no-files-found: error
 
       - name: Upload .freebsd artifact
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
         uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
         with:
           name: Bitwarden-${{ env.PACKAGE_VERSION }}-x64.freebsd
           path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64.freebsd
+          if-no-files-found: error
 
       - name: Upload .snap artifact
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
         uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
         with:
           name: bitwarden_${{ env.PACKAGE_VERSION }}_amd64.snap
           path: ./dist/bitwarden_${{ env.PACKAGE_VERSION }}_amd64.snap
+          if-no-files-found: error
 
       - name: Upload .AppImage artifact
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
         uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
         with:
           name: Bitwarden-${{ env.PACKAGE_VERSION }}-x86_64.AppImage
           path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x86_64.AppImage
+          if-no-files-found: error
 
 
   windows:
+    name: Windows
     runs-on: windows-latest
     steps:
       - name: Set up dotnet
@@ -210,48 +210,49 @@ jobs:
           choco pack ./dist/chocolatey/bitwarden.nuspec --version "$env:PACKAGE_VERSION" --out ./dist/chocolatey
 
       - name: Upload portable exe artifact
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
         uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
         with:
           name: Bitwarden-Portable-${{ env.PACKAGE_VERSION }}.exe
           path: ./dist/Bitwarden-Portable-${{ env.PACKAGE_VERSION }}.exe
+          if-no-files-found: error
 
       - name: Upload installer exe artifact
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
         uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
         with:
           name: Bitwarden-Installer-${{ env.PACKAGE_VERSION }}.exe
           path: ./dist/nsis-web/Bitwarden-Installer-${{ env.PACKAGE_VERSION }}.exe
+          if-no-files-found: error
 
       - name: Upload store appx ia32 artifact
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
         uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
         with:
           name: Bitwarden-${{ env.PACKAGE_VERSION }}-ia32-store.appx
           path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-ia32-store.appx
+          if-no-files-found: error
 
       - name: Upload store appx x64 artifact
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
         uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
         with:
           name: Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx
           path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx
+          if-no-files-found: error
 
       - name: Upload store appx ARM64 artifact
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
         uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
         with:
           name: Bitwarden-${{ env.PACKAGE_VERSION }}-arm64-store.appx
           path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-arm64-store.appx
+          if-no-files-found: error
 
       - name: Upload nupkg artifact
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
         uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
         with:
           name: bitwarden.${{ env.PACKAGE_VERSION }}.nupkg
           path: ./dist/chocolatey/bitwarden.${{ env.PACKAGE_VERSION }}.nupkg
+          if-no-files-found: error
 
   macos:
+    name: MacOS
     runs-on: macos-latest
     steps:
       - name: Set up Node
@@ -339,7 +340,7 @@ jobs:
         run: ./scripts/safari-build.ps1 -copyonly
 
       - name: Build application (dev)
-        if: github.ref != 'refs/heads/master' || github.ref == 'refs/heads/rc'
+        if: github.ref != 'refs/heads/master' || github.ref != 'refs/heads/rc'
         run: npm run build
 
       - name: Build application (dist)
@@ -355,6 +356,7 @@ jobs:
         with:
           name: Bitwarden-${{ env.PACKAGE_VERSION }}-mac.zip
           path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-mac.zip
+          if-no-files-found: error
 
       - name: Upload .dmg artifact
         if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
@@ -362,6 +364,7 @@ jobs:
         with:
           name: Bitwarden-${{ env.PACKAGE_VERSION }}.dmg
           path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}.dmg
+          if-no-files-found: error
 
       - name: Load Safari extension for App Store
         if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
@@ -383,3 +386,4 @@ jobs:
         with:
           name: Bitwarden-${{ env.PACKAGE_VERSION }}-universal.pkg
           path: ./dist/mas-universal/Bitwarden-${{ env.PACKAGE_VERSION }}-universal.pkg
+          if-no-files-found: error

.github/workflows/deploy.yml

@@ -6,13 +6,10 @@ on:
       release_tag_name_input:
         description: "Release Tag Name <X.X.X>"
         required: true
-  release:
-    types:
-      - published
-
 
 jobs:
   setup:
+    name: Setup
     runs-on: ubuntu-latest
     outputs:
       package_version: ${{ steps.create_tags.outputs.package_version }}
@@ -52,7 +49,6 @@ jobs:
         env:
           RELEASE_TAG_NAME_INPUT: ${{ github.event.inputs.release_tag_name_input }}
 
-
   snap:
     name: Deploy Snap
     runs-on: ubuntu-latest
@@ -69,10 +65,10 @@ jobs:
         with:
           snapcraft_token: ${{ secrets.SNAP_TOKEN }}
 
-      - name: setup
+      - name: Setup
         run: mkdir dist
 
-      - name: get snap package
+      - name: Get snap package
         uses: Xotl/cool-github-releases@16c58a5863d6ba9944f63ca8bb78bb3249ce1d81
         with:
           mode: download
@@ -80,7 +76,7 @@ jobs:
           assets: bitwarden_${{ env.PKG_VERSION }}_amd64.snap|./dist/bitwarden_${{ env.PKG_VERSION }}_amd64.snap
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: test
+      - name: Test
         run: ls -alht dist
 
       - name: Deploy to Snap Store
@@ -88,7 +84,6 @@ jobs:
           snapcraft upload dist/bitwarden_${{ env.PKG_VERSION }}_amd64.snap --release stable
           snapcraft logout
 
-
   choco:
     name: Deploy Choco
     runs-on: windows-latest
@@ -113,7 +108,7 @@ jobs:
         env:
           CHOCO_API_KEY: ${{ secrets.CHOCO_API_KEY }}
 
-      - name: make dist dir 
+      - name: Make dist dir 
         shell: pwsh
         run: New-Item -ItemType directory -Path ./dist
 
@@ -131,8 +126,8 @@ jobs:
           cd dist
           choco push
 
-
   macos:
+    name: Deploy MacOS
     runs-on: macos-latest
     needs: setup
     env:
@@ -142,10 +137,10 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
-      - name: make target directory
+      - name: Make target directory
         run: mkdir -p dist/mas-universal
 
-      - name: Get mac release asset
+      - name: Get Mac release asset
         uses: Xotl/cool-github-releases@16c58a5863d6ba9944f63ca8bb78bb3249ce1d81
         with:
           mode: download
@@ -158,3 +153,24 @@ jobs:
         env:
           APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
           APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+
+  publish:
+    name: Publish Release
+    runs-on: ubuntu-latest
+    needs: 
+      - setup
+      - snap
+      - choco
+      - macos
+    env:
+      RELEASE_VERSION: ${{ needs.setup.outputs.release_version }}
+      TAG_VERSION: ${{ needs.setup.outputs.tag_version }}
+    steps:
+      - name: Publish release
+        run: |
+          hub release edit \
+            --draft=false \
+            --message "" \
+            $TAG_VERSION
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -10,9 +10,9 @@ on:
         description: 'Browser Extension ref (defaults to `master`):'
         default: master
 
-
 jobs:
   setup:
+    name: Setup
     runs-on: ubuntu-latest
     outputs:
       release_upload_url: ${{ steps.create_release.outputs.upload_url }}
@@ -59,8 +59,8 @@ jobs:
           draft: true
           prerelease: false
 
-
   linux:
+    name: Linux
     runs-on: ubuntu-latest
     needs: setup
     steps:
@@ -106,8 +106,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-
   windows-signed:
+    name: Windows Signed
     runs-on: windows-latest
     needs: setup
     steps:
@@ -212,8 +212,8 @@ jobs:
           asset_path: ./dist/chocolatey/bitwarden.${{ env.PACKAGE_VERSION }}.nupkg
           asset_content_type: application
 
-
   windows-store:
+    name: Windows Store
     runs-on: windows-latest
     needs: setup
     steps:
@@ -290,6 +290,7 @@ jobs:
           asset_content_type: application
 
   macos:
+    name: MacOS
     runs-on: macos-latest
     needs: setup
     steps: