From 34c2155f6a0408df22acaf3f104d3481768d7cad Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Mon, 9 Dec 2024 13:19:14 +0500 Subject: [PATCH 1/4] ci: skip running test-e2e-premium on PRs from forks Resolves #15557 --- .github/workflows/ci.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6fb1ea68ed8cd..44076a1eba86c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -630,11 +630,8 @@ jobs: working-directory: site test-e2e: - # test-e2e fails on 2-core 8GB runners, so we use the 4-core 16GB runner runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-4' || 'ubuntu-latest' }} needs: changes - if: needs.changes.outputs.go == 'true' || needs.changes.outputs.ts == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main' - timeout-minutes: 20 strategy: fail-fast: false matrix: @@ -643,6 +640,9 @@ jobs: name: test-e2e - premium: true name: test-e2e-premium + # Skip test-e2e on forks as they don't have access to CI secrets + if: (needs.changes.outputs.go == 'true' || needs.changes.outputs.ts == 'true' || needs.changes.outputs.ci == 'true') && !(github.event.pull_request.head.repo.fork && matrix.variant.premium) || github.ref == 'refs/heads/main' + timeout-minutes: 20 name: ${{ matrix.variant.name }} steps: - name: Harden Runner @@ -749,7 +749,7 @@ jobs: # Prevent excessive build runs on minor version changes skip: "@(renovate/**|dependabot/**)" # Run TurboSnap to trace file dependencies to related stories - # and tell chromatic to only take snapshots of relevent stories + # and tell chromatic to only take snapshots of relevant stories onlyChanged: true # Avoid uploading single files, because that's very slow zip: true @@ -776,7 +776,7 @@ jobs: workingDir: "./site" storybookBaseDir: "./site" # Run TurboSnap to trace file dependencies to related stories - # and tell chromatic to only take snapshots of relevent stories + # and tell chromatic to only take snapshots of relevant stories onlyChanged: true # Avoid uploading single files, because that's very slow zip: true From 718da72462f420e21d72f209b4f19827e5f134f0 Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Mon, 9 Dec 2024 14:16:48 +0500 Subject: [PATCH 2/4] Update .github/workflows/ci.yaml Co-authored-by: Dean Sheather --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 44076a1eba86c..a30aa0b7f1d58 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -641,7 +641,7 @@ jobs: - premium: true name: test-e2e-premium # Skip test-e2e on forks as they don't have access to CI secrets - if: (needs.changes.outputs.go == 'true' || needs.changes.outputs.ts == 'true' || needs.changes.outputs.ci == 'true') && !(github.event.pull_request.head.repo.fork && matrix.variant.premium) || github.ref == 'refs/heads/main' + if: (needs.changes.outputs.go == 'true' || needs.changes.outputs.ts == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main') && !(github.event.pull_request.head.repo.fork && matrix.variant.premium) timeout-minutes: 20 name: ${{ matrix.variant.name }} steps: From 94351fef56726af69f261ec496674d3ba67d4629 Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Mon, 9 Dec 2024 14:33:30 +0500 Subject: [PATCH 3/4] skip all e2e tests on PRS from forks --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a30aa0b7f1d58..07fd3f4a58b41 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -641,7 +641,7 @@ jobs: - premium: true name: test-e2e-premium # Skip test-e2e on forks as they don't have access to CI secrets - if: (needs.changes.outputs.go == 'true' || needs.changes.outputs.ts == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main') && !(github.event.pull_request.head.repo.fork && matrix.variant.premium) + if: (needs.changes.outputs.go == 'true' || needs.changes.outputs.ts == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main') && !(github.event.pull_request.head.repo.fork) timeout-minutes: 20 name: ${{ matrix.variant.name }} steps: From 02535c27d1db67bbb9e5f743d735677b40ab8b69 Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Mon, 9 Dec 2024 14:38:09 +0500 Subject: [PATCH 4/4] `make fmt` --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 07fd3f4a58b41..af2a7bb1bd66b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -641,7 +641,7 @@ jobs: - premium: true name: test-e2e-premium # Skip test-e2e on forks as they don't have access to CI secrets - if: (needs.changes.outputs.go == 'true' || needs.changes.outputs.ts == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main') && !(github.event.pull_request.head.repo.fork) + if: (needs.changes.outputs.go == 'true' || needs.changes.outputs.ts == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main') && !(github.event.pull_request.head.repo.fork) timeout-minutes: 20 name: ${{ matrix.variant.name }} steps: