handle non-PRs

Author: mydea

.github/workflows/build.yml

@@ -861,13 +861,11 @@ jobs:
 
       - name: Determine which E2E test applications should be run
         id: matrix
-        if: github.event_name == 'pull_request'
         run: yarn --silent test:build-matrix --base=${{ 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
-        if: github.event_name == 'pull_request'
         run: yarn --silent test:build-matrix-optional --base=${{ github.event.pull_request.base.sha }} >> $GITHUB_OUTPUT
         working-directory: dev-packages/e2e-tests
 
@@ -966,7 +964,7 @@ jobs:
 
       - name: Upload Playwright Traces
         uses: actions/upload-artifact@v4
-        if: failure() &&  steps.should-skip.outputs.SKIP != 'true'
+        if: failure()
         with:
           name: playwright-traces-job_e2e_playwright_tests-${{ matrix.test-application}}
           path: dev-packages/e2e-tests/test-applications/${{ matrix.test-application}}/test-results
@@ -1043,12 +1041,6 @@ jobs:
         with:
           dependency_cache_key: ${{ needs.job_build.outputs.dependency_cache_key }}
 
-      - name: Determine if test app should be run
-        id: should-skip
-        if: github.event_name == 'pull_request'
-        run: yarn --silent test:should-skip ${{ matrix.test-application }} --base=${{ github.event.pull_request.base.sha }} >> $GITHUB_OUTPUT
-        working-directory: dev-packages/e2e-tests
-
       - name: Restore tarball cache
         uses: actions/cache/restore@v4
         id: restore-tarball-cache
@@ -1057,7 +1049,7 @@ jobs:
           key: ${{ env.BUILD_CACHE_TARBALL_KEY }}
 
       - name: Build tarballs if not cached
-        if: steps.restore-tarball-cache.outputs.cache-hit != 'true' &&  steps.should-skip.outputs.SKIP != 'true'
+        if: steps.restore-tarball-cache.outputs.cache-hit != 'true'
         run: yarn build:tarball
 
       - name: Install Playwright

dev-packages/e2e-tests/lib/getTestMatrix.ts

@@ -10,6 +10,15 @@ interface MatrixInclude {
   label?: string;
 }
 
+/**
+ * This methods generates a matrix for the GitHub Actions workflow to run the E2E tests.
+ * It checks which test applications are affected by the current changes in the PR and then generates a matrix
+ * including all test apps that have at least one dependency that was changed in the PR.
+ * If no `--base=xxx` is provided, it will output all test applications.
+ *
+ * If `--optional=true` is set, it will generate a matrix of optional test applications only.
+ * Otherwise, these will be skipped.
+ */
 function run(): void {
   const args: Record<string, string> = {};
   process.argv
@@ -22,30 +31,15 @@ function run(): void {
       args[argName] = argValue;
     });
 
-  // We default to `develop` as base, if none is specified
-  // head has a correct default value anyhow
-  const { base = 'develop', head, optional = 'false' } = args;
+  const { base, head, optional = 'false' } = args;
 
   const testApplications = globSync('*', { cwd: `${__dirname}/../test-applications/` });
 
-  const additionalArgs = [];
-  if (base) {
-    additionalArgs.push(`--base=${base}`);
-  }
-  if (head) {
-    additionalArgs.push(`--head=${head}`);
-  }
-
-  const affectedProjects = execSync(`yarn --silent nx show projects --affected ${additionalArgs.join(' ')}`)
-    .toString()
-    .split('\n')
-    .map(line => line.trim())
-    .filter(Boolean);
-
-  const includedTestApplications = testApplications.filter(testApp => {
-    const sentryDependencies = getSentryDependencies(testApp);
-    return sentryDependencies.some(dep => affectedProjects.includes(dep));
-  });
+  // If `--base=xxx` is defined, we only want to get test applications changed since that base
+  // Else, we take all test applications (e.g. on push)
+  const includedTestApplications = base
+    ? getAffectedTestApplications(testApplications, { base, head })
+    : testApplications;
 
   const optionalMode = optional === 'true';
   const includes: MatrixInclude[] = [];
@@ -121,3 +115,25 @@ function getPackageJson(appName: string): {
 }
 
 run();
+
+function getAffectedTestApplications(
+  testApplications: string[],
+  { base = 'develop', head }: { base?: string; head?: string },
+): string[] {
+  const additionalArgs = [`--base=${base}`];
+
+  if (head) {
+    additionalArgs.push(`--head=${head}`);
+  }
+
+  const affectedProjects = execSync(`yarn --silent nx show projects --affected ${additionalArgs.join(' ')}`)
+    .toString()
+    .split('\n')
+    .map(line => line.trim())
+    .filter(Boolean);
+
+  return testApplications.filter(testApp => {
+    const sentryDependencies = getSentryDependencies(testApp);
+    return sentryDependencies.some(dep => affectedProjects.includes(dep));
+  });
+}