From e4fc715b35b6cffd7f2edab635249bae8c769678 Mon Sep 17 00:00:00 2001
From: Joseph Flinn <joseph.s.flinn@gmail.com>
Date: Wed, 27 Oct 2021 11:46:37 -0700
Subject: [PATCH 1/2] fixing the different naming schemes between the build
 artifacts

---
 .github/workflows/build.yml   |  4 ++--
 .github/workflows/release.yml | 26 ++++++++++----------------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5cfcb75f44..79dcc8f98a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -121,7 +121,7 @@ jobs:
           call git submodule update --init --recursive
           cd ../
           del /S/Q "Source\.git\objects\pack\*"
-          call 7z a browser-source-%_BUILD_NUMBER%.zip "Source\*"
+          call 7z a browser-source.zip "Source\*"
 
       - name: Upload Opera artifact
         uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
@@ -155,7 +155,7 @@ jobs:
         uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
         with:
           name: browser-source-${{ env._BUILD_NUMBER }}.zip
-          path: dist/browser-source-${{ env._BUILD_NUMBER }}.zip
+          path: dist/browser-source.zip
           if-no-files-found: error
 
       - name: Upload coverage artifact
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 78132e3f4b..257102cdac 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -83,34 +83,28 @@ jobs:
       - setup
       - locales-test
     steps:
-      - name: Get build number
-        id: get-build-commit
-        run: |
-          build_commit=$(ls browser-source-* | cut -d '.' -f 1 | cut -d '-' -f 3)
-          echo "::set-output name=build-commit::$build_commit"
-
       - name: Download latest RC build artifacts
         uses: bitwarden/gh-actions/download-artifacts@23433be15ed6fd046ce12b6889c5184a8d9c8783
         with:
           workflow: build.yml
           workflow_conclusion: success
           branch: release
-          artifacts: 'browser-source-${{ steps.get-build-commit.outputs.build-commit }}.zip,
-                      dist-chrome-${{ steps.get-build-commit.outputs.build-commit }}.zip,
-                      dist-opera-${{ steps.get-build-commit.outputs.build-commit }}.zip,
-                      dist-firefox-${{ steps.get-build-commit.outputs.build-commit }}.zip,
-                      dist-edge-${{ steps.get-build-commit.outputs.build-commit }}.zip'
+          artifacts: 'browser-source-*.zip,
+                      dist-chrome-*.zip,
+                      dist-opera-*.zip,
+                      dist-firefox-*.zip,
+                      dist-edge-*.zip'
 
       - name: Rename build artifacts
         env:
           BUILD_COMMIT: ${{ steps.get-build-commit.outputs.build-commit }}
           PACKAGE_VERSION: ${{ needs.setup.outputs.release-version }}
         run: |
-          mv browser-source-$BUILD_COMMIT.zip browser-source-$PACKAGE_VERSION.zip
-          mv dist-chrome-$BUILD_COMMIT.zip dist-chrome-$PACKAGE_VERSION.zip
-          mv dist-opera-$BUILD_COMMIT.zip dist-opera-$PACKAGE_VERSION.zip
-          mv dist-firefox-$BUILD_COMMIT.zip dist-firefox-$PACKAGE_VERSION.zip
-          mv dist-edge-$BUILD_COMMIT.zip dist-edge-$PACKAGE_VERSION.zip
+          mv browser-source.zip browser-source-$PACKAGE_VERSION.zip
+          mv dist-chrome.zip dist-chrome-$PACKAGE_VERSION.zip
+          mv dist-opera.zip dist-opera-$PACKAGE_VERSION.zip
+          mv dist-firefox.zip dist-firefox-$PACKAGE_VERSION.zip
+          mv dist-edge.zip dist-edge-$PACKAGE_VERSION.zip
 
       - name: Create release
         uses: ncipollo/release-action@95215a3cb6e6a1908b3c44e00b4fdb15548b1e09

From fed6a81f6bfcfee3c10471c70a63ffaedb7dd816 Mon Sep 17 00:00:00 2001
From: Joseph Flinn <joseph.s.flinn@gmail.com>
Date: Wed, 27 Oct 2021 11:48:50 -0700
Subject: [PATCH 2/2] removed the unneeded build-commit env var

---
 .github/workflows/release.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 257102cdac..cc346d5310 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -97,7 +97,6 @@ jobs:
 
       - name: Rename build artifacts
         env:
-          BUILD_COMMIT: ${{ steps.get-build-commit.outputs.build-commit }}
           PACKAGE_VERSION: ${{ needs.setup.outputs.release-version }}
         run: |
           mv browser-source.zip browser-source-$PACKAGE_VERSION.zip