Merge pull request evidence-dev#3031 from evidence-dev/ci/adjust-runner-style

[CI] - Use fewer runners for e2e testing

Author: archiewood

.github/workflows/e2e.yml

@@ -5,25 +5,11 @@ on:
     branches: [main, next]
 
 jobs:
-  find-e2e-test-projects:
-    name: Find E2E Test Projects
-    runs-on: ubuntu-latest
-    outputs:
-      e2e-test-projects: ${{ steps.e2e-test-projects.outputs.e2e-test-projects }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - id: e2e-test-projects
-        run: echo "e2e-test-projects=$(find e2e -maxdepth 1 -type d -printf "%f\n" | jq --raw-input --slurp --compact-output 'split("\n")[1:-1]')" >> ${GITHUB_OUTPUT}
-
   run-tests:
-    needs:
-      - find-e2e-test-projects
     timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
-        project: ${{ fromJson(needs.find-e2e-test-projects.outputs.e2e-test-projects) }}
         os: [ubuntu-latest, macOS-latest, windows-latest]
         node-version: [18.13.0, 20, 22]
 
@@ -34,7 +20,7 @@ jobs:
           - isMain: false
             node-version: 20
 
-    name: e2e/${{ matrix.project }}/${{ matrix.os }}/node-${{ matrix.node-version}}
+    name: e2e/${{ matrix.os }}/node-${{ matrix.node-version}}
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -60,28 +46,23 @@ jobs:
         run: pnpm playwright install --with-deps
 
       - name: Run setup
-        working-directory: ./e2e/${{ matrix.project }}
-        run: pnpm run --if-present setup
+        run: pnpm --filter "./e2e/*" run --if-present setup
 
       - name: Run sources
-        working-directory: ./e2e/${{ matrix.project }}
-        run: pnpm run sources
+        run: pnpm --filter "./e2e/*" run sources
 
       - name: Run dev mode tests
-        working-directory: ./e2e/${{ matrix.project }}
-        run: pnpm run test:dev
+        run: pnpm --filter "./e2e/*" --sequential run test:dev
 
       - name: Build
-        working-directory: ./e2e/${{ matrix.project }}
-        run: pnpm run build
+        run: pnpm --filter "./e2e/*" run build
 
       - name: Run preview mode tests
-        working-directory: ./e2e/${{ matrix.project }}
-        run: pnpm run test:preview
+        run: pnpm --filter "./e2e/*" --sequential run test:preview
 
       - name: Upload Playwright reports
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: playwright-report__e2e_${{ matrix.project }}_${{ matrix.os }}_node-${{ matrix.node-version }}
-          path: e2e/${{ matrix.project }}/playwright-report
+          name: playwright-report__e2e_${{ matrix.os }}_node-${{ matrix.node-version }}
+          path: e2e/**/playwright-report

e2e/dev-server-startup/tests/tests.spec.js

@@ -25,7 +25,7 @@ test(`Should be timed appropriately`, async ({ page }) => {
 	await fs.rm(`test.log`, { force: true });
 
 	const procStartTime = performance.now();
-	const devServerProcess = child_process.spawn('npm', ['run', 'dev'], {
+	const devServerProcess = child_process.spawn('npm', ['run', 'dev', '--', '--port', '18000'], {
 		stdio: 'pipe',
 		shell: true,
 		env: {
@@ -67,7 +67,7 @@ test(`Should be timed appropriately`, async ({ page }) => {
 				// await new Promise((r) => setTimeout(r, 20000));
 				await fs.rm(`./.evidence/template/.evidence-queries`, { recursive: true, force: true });
 				const reqStartTime = performance.now();
-				await await fetch('http://localhost:3000?tag=the-real-request', {
+				await await fetch('http://localhost:18000?tag=the-real-request', {
 					headers: {
 						'User-Agent': 'Birds ARE real :)'
 					}
@@ -77,7 +77,7 @@ test(`Should be timed appropriately`, async ({ page }) => {
 				const firstRequestDur = reqFinishTime - reqStartTime;
 
 				const loadStartTime = performance.now();
-				await page.goto('http://localhost:3000');
+				await page.goto('http://localhost:18000');
 				await waitForPageToLoad(page);
 				await expect(page.getByText('Magic Text 🪄')).toBeVisible();
 				const lostFinishTime = performance.now();
@@ -118,6 +118,8 @@ test(`Should be timed appropriately`, async ({ page }) => {
 				devServerProcess.kill();
 			}
 		});
+	}).finally(() => {
+		if (!devServerProcess.killed) devServerProcess.kill();
 	});
 	expect([0, null]).toContain(exitCode);
 });