Improve Testing (#4325)

.github/workflows/c3-e2e-project-cleanup.yml

@@ -10,6 +10,7 @@ env:
   node-version: 18.17.1
 jobs:
   cleanup:
+    timeout-minutes: 30
     name: "Cleanup Test Projects"
     if: ${{ github.repository_owner == 'cloudflare' }}
     runs-on: ubuntu-latest

.github/workflows/c3-e2e-quarantine.yml

@@ -12,7 +12,12 @@ env:
   bun-version: 1.0.3
 jobs:
   e2e:
+    timeout-minutes: 30
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os }}-${{ matrix.pm }}
+      cancel-in-progress: true
     name: ${{ format('E2E ({0})', matrix.pm) }}
+    if: github.repository_owner == 'cloudflare'
     strategy:
       matrix:
         os: [ubuntu-latest]

.github/workflows/c3-e2e.yml

@@ -10,6 +10,10 @@ env:
   bun-version: 1.0.3
 jobs:
   e2e:
+    timeout-minutes: 30
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os }}-${{ matrix.pm }}
+      cancel-in-progress: true
     name: ${{ format('E2E ({0})', matrix.pm) }}
     if: github.repository_owner == 'cloudflare' && github.event.pull_request.user.login != 'dependabot[bot]'
     strategy:

.github/workflows/choose-pages-projects.yml

@@ -39,6 +39,8 @@ jobs:
 
       - name: Build
         run: pnpm run build
+        env:
+          CI_OS: ${{ runner.os }}
 
       - name: Build Quick Edit
         run: cd packages/quick-edit && yarn setup && yarn custom:build

.github/workflows/codecov-context.yml

@@ -38,6 +38,7 @@ jobs:
         run: pnpm run build
         env:
           NODE_ENV: "production"
+          CI_OS: ${{ runner.os }}
 
       - name: Run tests & collect coverage
         run: pnpm run --filter wrangler test:ci

.github/workflows/create-pullrequest-prerelease.yml

@@ -7,7 +7,10 @@ jobs:
     if: ${{ github.repository_owner == 'cloudflare' }}
     name: Build & Publish a Prerelease to the Adhoc Registry
     runs-on: ubuntu-latest
-
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: true
+    timeout-minutes: 30
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v3
@@ -36,6 +39,8 @@ jobs:
         # `extract-runtime-versions.mjs` needs to be able to resolve `miniflare`, but we want to have the correct
         # `package.json` versions when we build packages for packing
         run: pnpm run build --filter miniflare
+        env:
+          CI_OS: ${{ runner.os }}
 
       - name: Extract runtime versions
         run: node .github/extract-runtime-versions.mjs # extract versions before modifying version to include commit hash
@@ -63,6 +68,7 @@ jobs:
           NODE_ENV: "production"
           ALGOLIA_APP_ID: ${{ secrets.ALGOLIA_APP_ID }}
           ALGOLIA_PUBLIC_KEY: ${{ secrets.ALGOLIA_PUBLIC_KEY }}
+          CI_OS: ${{ runner.os }}
 
       - name: Pack miniflare
         run: pnpm pack

.github/workflows/deploy-pages-project.yml

@@ -12,6 +12,10 @@ on:
 
 jobs:
   publish:
+    timeout-minutes: 30
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.package }}
+      cancel-in-progress: true
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
@@ -24,6 +28,8 @@ jobs:
 
       - name: Build
         run: pnpm run build
+        env:
+          CI_OS: ${{ runner.os }}
 
       - name: Deploy to Pages
         run: pnpm --filter ${{ inputs.package }} run deploy

.github/workflows/e2e.yml

@@ -3,29 +3,24 @@ name: E2E tests
 on:
   push:
     branches:
-      - main
       - changeset-release/main
   pull_request:
     types: [synchronize, opened, reopened, labeled, unlabeled]
   repository_dispatch:
 
 jobs:
   e2e-test:
-    if: github.repository_owner == 'cloudflare' && (github.event_name != 'pull_request' || (github.event_name == 'pull_request' && contains(github.event.*.labels.*.name, 'e2e' )) || (github.event_name == 'pull_request' && github.head_ref == 'changeset-release/main'))
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os }}-${{ matrix.node }}
+      cancel-in-progress: true
+    timeout-minutes: 30
+    if: github.repository_owner == 'cloudflare' && (github.event_name != 'pull_request' || (github.event_name == 'pull_request' && contains(github.event.*.labels.*.name, 'e2e' )))
     name: "E2E Test"
     strategy:
       fail-fast: false
       matrix:
-        os: [
-            # macos-11,
-            # macos-12,
-            macos-13,
-            windows-2019,
-            windows-2022,
-            # ubuntu-20.04,
-            ubuntu-22.04,
-          ]
-        node: ["16", "18"]
+        os: [macos-13, windows-2022, ubuntu-22.04]
+        node: ["18"]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout Repo
@@ -55,6 +50,7 @@ jobs:
         run: pnpm run build
         env:
           NODE_ENV: "production"
+          CI_OS: ${{ runner.os }}
 
       - name: Build Wrangler package for npm
         run: pnpm pack --pack-destination $HOME

.github/workflows/edge-preview-authenticated-proxy.yml

@@ -38,6 +38,7 @@ jobs:
         run: pnpm run build
         env:
           NODE_ENV: "production"
+          CI_OS: ${{ runner.os }}
 
       - name: Build & Publish Worker
         run: pnpm run publish

.github/workflows/format-errors.yml

@@ -37,6 +37,7 @@ jobs:
         run: pnpm run build
         env:
           NODE_ENV: "production"
+          CI_OS: ${{ runner.os }}
 
       - name: Build & Publish Worker
         run: pnpm run publish

.github/workflows/main.yml

@@ -9,6 +9,10 @@ on:
 
 jobs:
   test:
+    timeout-minutes: 30
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os }}
+      cancel-in-progress: true
     if: ${{ github.repository_owner == 'cloudflare' }}
     name: "Tests"
     strategy:
@@ -43,6 +47,7 @@ jobs:
         run: pnpm run build
         env:
           NODE_ENV: "production"
+          CI_OS: ${{ runner.os }}
 
       - name: Check for errors
         run: pnpm run check

.github/workflows/playground-preview-worker.yml

@@ -38,6 +38,7 @@ jobs:
         run: pnpm run build
         env:
           NODE_ENV: "production"
+          CI_OS: ${{ runner.os }}
 
       - name: Build & Publish Worker
         run: pnpm run deploy

.github/workflows/playground-worker-tests.yml

@@ -42,6 +42,7 @@ jobs:
         run: pnpm run build
         env:
           NODE_ENV: "production"
+          CI_OS: ${{ runner.os }}
 
       - name: Build & Publish Testing Playground Worker
         run: pnpm run deploy:testing

.github/workflows/prerelease-create-cloudflare.yml

@@ -44,6 +44,7 @@ jobs:
         run: pnpm run build
         env:
           NODE_ENV: "production"
+          CI_OS: ${{ runner.os }}
 
       - name: Publish Beta to NPM
         run: pnpm publish --tag beta

.github/workflows/prereleases.yml

@@ -6,6 +6,10 @@ on:
       - main
 jobs:
   prerelease:
+    timeout-minutes: 30
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: true
     if: ${{ github.repository_owner == 'cloudflare' }}
     name: Build & Publish a beta release to NPM
     runs-on: ubuntu-latest
@@ -49,6 +53,7 @@ jobs:
         run: pnpm run build
         env:
           NODE_ENV: "production"
+          CI_OS: ${{ runner.os }}
 
       - name: Check for errors
         run: pnpm run check
@@ -70,6 +75,7 @@ jobs:
         working-directory: packages/wrangler
 
   publish_prerelease_registry:
+    timeout-minutes: 30
     if: ${{ github.repository_owner == 'cloudflare' }}
     name: Publish Prerelease Registry
     needs: prerelease
@@ -105,6 +111,7 @@ jobs:
           NODE_ENV: "production"
           ALGOLIA_APP_ID: ${{ secrets.ALGOLIA_APP_ID }}
           ALGOLIA_PUBLIC_KEY: ${{ secrets.ALGOLIA_PUBLIC_KEY }}
+          CI_OS: ${{ runner.os }}
 
       - name: Build & Publish Prerelease Registry
         run: pnpm run publish