Add archive_name and artifact_name to matrix

bitwarden · Dec 31, 2024 · 7b2daa0 · 7b2daa0
1 parent caeb06e
commit 7b2daa0
Showing 1 changed file with 17 additions and 52 deletions.
diff --git a/.github/workflows/build-browser.yml b/.github/workflows/build-browser.yml
@@ -191,18 +191,32 @@ jobs:
         include:
           - name: "chrome"
             npm_command: "dist:chrome"
+            archive_name: "dist-chrome.zip"
+            artifact_name: "dist-chrome-MV3-${{ env._BUILD_NUMBER }}.zip"
           - name: "edge"
             npm_command: "dist:edge"
+            archive_name: "dist-edge.zip"
+            artifact_name: "dist-edge-${{ env._BUILD_NUMBER }}.zip"
           - name: "edge-mv3"
             npm_command: "dist:edge:mv3"
+            archive_name: "dist-edge.zip"
+            artifact_name: "DO-NOT-USE-FOR-PROD-dist-edge-MV3-${{ env._BUILD_NUMBER }}.zip"
           - name: "firefox"
             npm_command: "dist:firefox"
+            archive_name: "dist-firefox.zip"
+            artifact_name: "dist-firefox-${{ env._BUILD_NUMBER }}.zip"
           - name: "firefox-mv3"
             npm_command: "dist:firefox:mv3"
+            archive_name: "dist-firefox.zip"
+            artifact_name: "DO-NOT-USE-FOR-PROD-dist-firefox-MV3-${{ env._BUILD_NUMBER }}.zip"
           - name: "opera"
             npm_command: "dist:opera"
+            archive_name: "dist-opera.zip"
+            artifact_name: "dist-opera-${{ env._BUILD_NUMBER }}.zip"
           - name: "opera-mv3"
             npm_command: "dist:opera:mv3"
+            archive_name: "dist-opera.zip"
+            artifact_name: "DO-NOT-USE-FOR-PROD-dist-opera-MV3-${{ env._BUILD_NUMBER }}.zip"
     steps:
       - name: Check out repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -260,60 +274,11 @@ jobs:
         run: npm run ${{ matrix.npm_command }}
         working-directory: browser-source/apps/browser
 
-      - name: Upload Chrome MV3 artifact
-        if: ${{ matrix.name == 'chrome' }}
+      - name: Upload extension artifact
         uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
-          name: dist-chrome-MV3-${{ env._BUILD_NUMBER }}.zip
-          path: browser-source/apps/browser/dist/dist-chrome.zip
-          if-no-files-found: error
-
-      - name: Upload Edge artifact
-        if: ${{ matrix.name == 'edge' }}
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
-        with:
-          name: dist-edge-${{ env._BUILD_NUMBER }}.zip
-          path: browser-source/apps/browser/dist/dist-edge.zip
-          if-no-files-found: error
-
-      - name: Upload Edge MV3 artifact (DO NOT USE FOR PROD)
-        if: ${{ matrix.name == 'edge-mv3' }}
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
-        with:
-          name: DO-NOT-USE-FOR-PROD-dist-edge-MV3-${{ env._BUILD_NUMBER }}.zip
-          path: browser-source/apps/browser/dist/dist-edge.zip
-          if-no-files-found: error
-
-      - name: Upload Firefox artifact
-        if: ${{ matrix.name == 'firefox' }}
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
-        with:
-          name: dist-firefox-${{ env._BUILD_NUMBER }}.zip
-          path: browser-source/apps/browser/dist/dist-firefox.zip
-          if-no-files-found: error
-
-      - name: Upload Firefox MV3 artifact (DO NOT USE FOR PROD)
-        if: ${{ matrix.name == 'firefox-mv3' }}
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
-        with:
-          name: DO-NOT-USE-FOR-PROD-dist-firefox-MV3-${{ env._BUILD_NUMBER }}.zip
-          path: browser-source/apps/browser/dist/dist-firefox.zip
-          if-no-files-found: error
-
-      - name: Upload Opera artifact
-        if: ${{ matrix.name == 'opera' }}
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
-        with:
-          name: dist-opera-${{ env._BUILD_NUMBER }}.zip
-          path: browser-source/apps/browser/dist/dist-opera.zip
-          if-no-files-found: error
-
-      - name: Upload Opera MV3 artifact (DO NOT USE FOR PROD)
-        if: ${{ matrix.name == 'opera-mv3' }}
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
-        with:
-          name: DO-NOT-USE-FOR-PROD-dist-opera-MV3-${{ env._BUILD_NUMBER }}.zip
-          path: browser-source/apps/browser/dist/dist-opera.zip
+          name: ${{ matrix.artifact_name }}
+          path: browser-source/apps/browser/dist/${{ matrix.archive_name }}
           if-no-files-found: error