chore(ci): Streamline tarball packaging & e2e test matrix generation

Author: mydea

.github/workflows/build.yml

@@ -48,7 +48,7 @@ env:
     ${{ github.workspace }}/packages/ember/*.d.ts
     ${{ github.workspace }}/packages/gatsby/*.d.ts
 
-  BUILD_CACHE_TARBALL_KEY: tarball-${{ github.event.inputs.commit || github.sha }}
+  BUILD_TARBALL_PATH: ${{ github.workspace }}/packages/*/*.tgz
 
   # GH will use the first restore-key it finds that matches
   # So it will start by looking for one from the same branch, else take the newest one it can find elsewhere
@@ -298,7 +298,7 @@ jobs:
 
   job_artifacts:
     name: Upload Artifacts
-    needs: [job_get_metadata, job_build]
+    needs: [job_get_metadata, job_build, job_build_tarballs]
     runs-on: ubuntu-24.04
     # Build artifacts are only needed for releasing workflow.
     if: needs.job_get_metadata.outputs.is_release == 'true'
@@ -316,8 +316,10 @@ jobs:
         with:
           dependency_cache_key: ${{ needs.job_build.outputs.dependency_cache_key }}
 
-      - name: Pack tarballs
-        run: yarn build:tarball
+      - name: Restore tarball artifacts
+        uses: actions/download-artifact@v7
+        with:
+          name: tarball-output
 
       - name: Archive artifacts
         uses: actions/upload-artifact@v7
@@ -834,19 +836,16 @@ jobs:
           cd packages/remix
           yarn test:integration:ci
 
-  job_e2e_prepare:
-    name: Prepare E2E tests
+  job_build_tarballs:
+    name: Build tarballs
     # We want to run this if:
     # - The build job was successful, not skipped
     if: |
       always() &&
       needs.job_build.result == 'success'
     needs: [job_get_metadata, job_build]
-    runs-on: ubuntu-24.04-large-js
+    runs-on: ubuntu-24.04
     timeout-minutes: 15
-    outputs:
-      matrix: ${{ steps.matrix.outputs.matrix }}
-      matrix-optional: ${{ steps.matrix-optional.outputs.matrix }}
     steps:
       - name: Check out base commit (${{ github.event.pull_request.base.sha }})
         uses: actions/checkout@v6
@@ -876,33 +875,23 @@ jobs:
       - name: Build tarballs
         run: yarn build:tarball
 
-      - name: Stores tarballs in cache
-        uses: actions/cache/save@v5
+      - name: Upload tarball artifacts
+        uses: actions/upload-artifact@v7
         with:
-          path: ${{ github.workspace }}/packages/*/*.tgz
-          key: ${{ env.BUILD_CACHE_TARBALL_KEY }}
-
-      - name: Determine which E2E test applications should be run
-        id: matrix
-        run:
-          yarn --silent ci:build-matrix --base=${{ (github.event_name == 'pull_request' &&
-          github.event.pull_request.base.sha) || '' }} >> $GITHUB_OUTPUT
-        working-directory: dev-packages/e2e-tests
-
-      - name: Determine which optional E2E test applications should be run
-        id: matrix-optional
-        run:
-          yarn --silent ci:build-matrix-optional --base=${{ (github.event_name == 'pull_request' &&
-          github.event.pull_request.base.sha) || '' }} >> $GITHUB_OUTPUT
-        working-directory: dev-packages/e2e-tests
+          name: tarball-output
+          path: ${{ env.BUILD_TARBALL_PATH }}
+          retention-days: 4
+          compression-level: 6
+          overwrite: true
 
   job_e2e_tests:
     name: E2E ${{ matrix.label || matrix.test-application }} Test
     # We need to add the `always()` check here because the previous step has this as well :(
     # See: https://github.com/actions/runner/issues/2205
     if:
-      always() && needs.job_e2e_prepare.result == 'success' && needs.job_e2e_prepare.outputs.matrix != '{"include":[]}'
-    needs: [job_get_metadata, job_build, job_e2e_prepare]
+      always() && needs.job_build_tarballs.result == 'success' && needs.job_get_metadata.outputs.e2e-matrix
+      !='{"include":[]}'
+    needs: [job_get_metadata, job_build, job_build_tarballs]
     runs-on: ubuntu-24.04
     timeout-minutes: 15
     env:
@@ -916,7 +905,7 @@ jobs:
       E2E_TEST_SENTRY_PROJECT: 'sentry-javascript-e2e-tests'
     strategy:
       fail-fast: false
-      matrix: ${{ fromJson(needs.job_e2e_prepare.outputs.matrix) }}
+      matrix: ${{ fromJson(needs.job_get_metadata.outputs.e2e-matrix) }}
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
         uses: actions/checkout@v6
@@ -948,16 +937,10 @@ jobs:
         with:
           dependency_cache_key: ${{ needs.job_build.outputs.dependency_cache_key }}
 
-      - name: Restore tarball cache
-        uses: actions/cache/restore@v5
-        id: restore-tarball-cache
+      - name: Restore tarball artifacts
+        uses: actions/download-artifact@v7
         with:
-          path: ${{ github.workspace }}/packages/*/*.tgz
-          key: ${{ env.BUILD_CACHE_TARBALL_KEY }}
-
-      - name: Build tarballs if not cached
-        if: steps.restore-tarball-cache.outputs.cache-hit != 'true'
-        run: yarn build:tarball
+          name: tarball-output
 
       - name: Validate Verdaccio
         run: yarn test:validate
@@ -1022,10 +1005,10 @@ jobs:
     # We need to add the `always()` check here because the previous step has this as well :(
     # See: https://github.com/actions/runner/issues/2205
     if:
-      always() && needs.job_get_metadata.outputs.is_release != 'true' && needs.job_e2e_prepare.result == 'success' &&
-      needs.job_e2e_prepare.outputs.matrix-optional != '{"include":[]}' && (github.event_name != 'pull_request' ||
+      always() && needs.job_get_metadata.outputs.is_release != 'true' && needs.job_build_tarballs.result == 'success' &&
+      needs.job_get_metadata.outputs.e2e-matrix-optional != '{"include":[]}' && (github.event_name != 'pull_request' ||
       github.event.pull_request.head.repo.full_name == github.repository) && github.actor != 'dependabot[bot]'
-    needs: [job_get_metadata, job_build, job_e2e_prepare]
+    needs: [job_get_metadata, job_build, job_build_tarballs]
     runs-on: ubuntu-24.04
     timeout-minutes: 15
     env:
@@ -1039,7 +1022,7 @@ jobs:
       E2E_TEST_SENTRY_PROJECT: 'sentry-javascript-e2e-tests'
     strategy:
       fail-fast: false
-      matrix: ${{ fromJson(needs.job_e2e_prepare.outputs.matrix-optional) }}
+      matrix: ${{ fromJson(needs.job_get_metadata.outputs.e2e-matrix-optional) }}
 
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
@@ -1058,16 +1041,10 @@ jobs:
         with:
           dependency_cache_key: ${{ needs.job_build.outputs.dependency_cache_key }}
 
-      - name: Restore tarball cache
-        uses: actions/cache/restore@v5
-        id: restore-tarball-cache
+      - name: Restore tarball artifacts
+        uses: actions/download-artifact@v7
         with:
-          path: ${{ github.workspace }}/packages/*/*.tgz
-          key: ${{ env.BUILD_CACHE_TARBALL_KEY }}
-
-      - name: Build tarballs if not cached
-        if: steps.restore-tarball-cache.outputs.cache-hit != 'true'
-        run: yarn build:tarball
+          name: tarball-output
 
       - name: Validate Verdaccio
         run: yarn test:validate

.github/workflows/ci-metadata.yml

@@ -31,6 +31,12 @@ on:
       force_skip_cache:
         description: 'Whether to skip caching (schedule or ci-skip-cache label)'
         value: ${{ jobs.get_metadata.outputs.force_skip_cache }}
+      e2e-matrix:
+        description: 'The matrix of E2E test applications to run'
+        value: ${{ jobs.get_metadata.outputs.e2e-matrix }}
+      e2e-matrix-optional:
+        description: 'The matrix of optional E2E test applications to run'
+        value: ${{ jobs.get_metadata.outputs.e2e-matrix-optional }}
 
 jobs:
   get_metadata:
@@ -70,6 +76,20 @@ jobs:
             any_code:
               - '!**/*.md'
 
+      - name: Determine which test applications should be run
+        id: matrix
+        run:
+          yarn --silent ci:build-matrix --base=${{ (github.event_name == 'pull_request' &&
+          github.event.pull_request.base.sha) || '' }} >> $GITHUB_OUTPUT
+        working-directory: dev-packages/e2e-tests
+
+      - name: Determine which optional E2E test applications should be run
+        id: matrix-optional
+        run:
+          yarn --silent ci:build-matrix-optional --base=${{ (github.event_name == 'pull_request' &&
+          github.event.pull_request.base.sha) || '' }} >> $GITHUB_OUTPUT
+        working-directory: dev-packages/e2e-tests
+
     outputs:
       commit_label: '${{ env.COMMIT_SHA }}: ${{ env.COMMIT_MESSAGE }}'
       # Note: These next three have to be checked as strings ('true'/'false')!
@@ -87,3 +107,5 @@ jobs:
       force_skip_cache:
         ${{ github.event_name == 'schedule' || (github.event_name == 'pull_request' &&
         contains(toJSON(github.event.pull_request.labels.*.name), 'ci-skip-cache')) }}
+      e2e-matrix: ${{ steps.matrix.outputs.matrix }}
+      e2e-matrix-optional: ${{ steps.matrix-optional.outputs.matrix }}