Skip to content

Commit d89e1ad

Browse files
authored
Collapse C3 E2E jobs (#8557)
* Collapse C3 E2E * fix CI
1 parent e94b46f commit d89e1ad

File tree

1 file changed

+15
-9
lines changed

1 file changed

+15
-9
lines changed

.github/workflows/c3-e2e.yml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ jobs:
2727
if: ${{ needs.turbo-ignore.outputs.skip == 'failure' }}
2828
timeout-minutes: 45
2929
concurrency:
30-
group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os }}-${{ matrix.pm.name }}-${{ matrix.pm.version }}-${{ matrix.experimental }}
30+
group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os }}-${{ matrix.pm.name }}-${{ matrix.pm.version }}
3131
cancel-in-progress: true
32-
name: ${{ format('Run tests for {0}@{1} on {2} (experimental:{3})', matrix.pm.name, matrix.pm.version, matrix.os, matrix.experimental) }}
32+
name: ${{ format('Run tests for {0}@{1} on {2}', matrix.pm.name, matrix.pm.version, matrix.os) }}
3333
strategy:
3434
fail-fast: false
3535
matrix:
@@ -41,15 +41,10 @@ jobs:
4141
{ name: bun, version: "1.0.3" },
4242
{ name: yarn, version: "1.0.0" },
4343
]
44-
experimental: [true, false]
4544
# include a single windows test with pnpm
4645
include:
4746
- os: windows-latest
4847
pm: { name: pnpm, version: "9.12.0" }
49-
experimental: true
50-
- os: windows-latest
51-
pm: { name: pnpm, version: "9.12.0" }
52-
experimental: false
5348
runs-on: ${{ matrix.os }}
5449
steps:
5550
- name: Checkout Repo
@@ -73,13 +68,24 @@ jobs:
7368
turbo-token: ${{ secrets.TURBO_TOKEN }}
7469
turbo-signature: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
7570

76-
- name: E2E Tests
71+
- name: E2E Tests (experimental)
72+
if: steps.changes.outputs.everything_but_markdown == 'true'
73+
uses: ./.github/actions/run-c3-e2e
74+
with:
75+
packageManager: ${{ matrix.pm.name }}
76+
packageManagerVersion: ${{ matrix.pm.version }}
77+
quarantine: false
78+
experimental: true
79+
accountId: ${{ secrets.TEST_CLOUDFLARE_ACCOUNT_ID }}
80+
apiToken: ${{ secrets.TEST_CLOUDFLARE_API_TOKEN }}
81+
82+
- name: E2E Tests (non-experimental)
7783
if: steps.changes.outputs.everything_but_markdown == 'true'
7884
uses: ./.github/actions/run-c3-e2e
7985
with:
8086
packageManager: ${{ matrix.pm.name }}
8187
packageManagerVersion: ${{ matrix.pm.version }}
8288
quarantine: false
83-
experimental: ${{ matrix.experimental }}
89+
experimental: false
8490
accountId: ${{ secrets.TEST_CLOUDFLARE_ACCOUNT_ID }}
8591
apiToken: ${{ secrets.TEST_CLOUDFLARE_API_TOKEN }}

0 commit comments

Comments
 (0)