Skip to content

Commit 2e1a214

Browse files
stipsanstipsan
authoredMar 12, 2025··
chore(CI): speedup gh workflows, reduce E2E flake (#8842)
·
v3.82.0v3.80.0
1 parent 2601018 commit 2e1a214

36 files changed

+251
-1083
lines changed
 

‎.github/workflows/are-we-compiled-yet.yml

+4-25
Original file line numberDiff line numberDiff line change
@@ -19,33 +19,12 @@ jobs:
1919
TURBO_TEAM: ${{ vars.TURBO_TEAM }}
2020

2121
steps:
22-
- name: Checkout
23-
uses: actions/checkout@v4
24-
22+
- uses: actions/checkout@v4
2523
- uses: pnpm/action-setup@v4
26-
name: Install pnpm
27-
id: pnpm-install
28-
with:
29-
run_install: false
30-
31-
- name: Get pnpm store directory
32-
id: pnpm-cache
33-
shell: bash
34-
run: |
35-
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
36-
37-
- name: Cache node modules
38-
id: cache-node-modules
39-
uses: actions/cache@v4
40-
env:
41-
cache-name: cache-node-modules
24+
- uses: actions/setup-node@v4
4225
with:
43-
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
44-
key: ${{ runner.os }}-pnpm-store-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }}
45-
restore-keys: |
46-
v1-${{ runner.os }}-pnpm-store-${{ env.cache-name }}-
47-
v1-${{ runner.os }}-pnpm-store-
48-
v1-${{ runner.os }}-
26+
cache: pnpm
27+
node-version: lts/*
4928

5029
- name: Install project dependencies
5130
run: pnpm install

‎.github/workflows/cli-test.yml

+4-30
Original file line numberDiff line numberDiff line change
@@ -33,38 +33,12 @@ jobs:
3333
# experimental: true
3434

3535
steps:
36-
- name: Checkout
37-
uses: actions/checkout@v4
38-
39-
- name: Setup node
40-
uses: actions/setup-node@v4
41-
with:
42-
node-version: ${{ matrix.node }}
43-
36+
- uses: actions/checkout@v4
4437
- uses: pnpm/action-setup@v4
45-
name: Install pnpm
46-
id: pnpm-install
38+
- uses: actions/setup-node@v4
4739
with:
48-
run_install: false
49-
50-
- name: Get pnpm store directory
51-
id: pnpm-cache
52-
shell: bash
53-
run: |
54-
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
55-
56-
- name: Cache node modules
57-
id: cache-node-modules
58-
uses: actions/cache@v4
59-
env:
60-
cache-name: cache-node-modules
61-
with:
62-
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
63-
key: ${{ runner.os }}-pnpm-store-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }}
64-
restore-keys: |
65-
v1-${{ runner.os }}-pnpm-store-${{ env.cache-name }}-
66-
v1-${{ runner.os }}-pnpm-store-
67-
v1-${{ runner.os }}-
40+
cache: pnpm
41+
node-version: ${{ matrix.node }}
6842

6943
- name: Install project dependencies
7044
run: pnpm install

‎.github/workflows/depCheck.yml

+3-26
Original file line numberDiff line numberDiff line change
@@ -7,34 +7,11 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- uses: actions/checkout@v4
10-
- uses: actions/setup-node@v4
11-
with:
12-
node-version: 18
13-
1410
- uses: pnpm/action-setup@v4
15-
name: Install pnpm
16-
id: pnpm-install
17-
with:
18-
run_install: false
19-
20-
- name: Get pnpm store directory
21-
id: pnpm-cache
22-
shell: bash
23-
run: |
24-
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
25-
26-
- name: Cache node modules
27-
id: cache-node-modules
28-
uses: actions/cache@v4
29-
env:
30-
cache-name: cache-node-modules
11+
- uses: actions/setup-node@v4
3112
with:
32-
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
33-
key: ${{ runner.os }}-pnpm-store-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }}
34-
restore-keys: |
35-
v1-${{ runner.os }}-pnpm-store-${{ env.cache-name }}-
36-
v1-${{ runner.os }}-pnpm-store-
37-
v1-${{ runner.os }}-
13+
cache: pnpm
14+
node-version: lts/*
3815

3916
- name: Install project dependencies
4017
run: pnpm install

‎.github/workflows/docReport.yml

+4-29
Original file line numberDiff line numberDiff line change
@@ -19,37 +19,12 @@ jobs:
1919
TURBO_TEAM: ${{ vars.TURBO_TEAM }}
2020

2121
steps:
22-
- name: Checkout
23-
uses: actions/checkout@v4
24-
25-
- uses: actions/setup-node@v4
26-
with:
27-
node-version: 18
28-
22+
- uses: actions/checkout@v4
2923
- uses: pnpm/action-setup@v4
30-
name: Install pnpm
31-
id: pnpm-install
32-
with:
33-
run_install: false
34-
35-
- name: Get pnpm store directory
36-
id: pnpm-cache
37-
shell: bash
38-
run: |
39-
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
40-
41-
- name: Cache node modules
42-
id: cache-node-modules
43-
uses: actions/cache@v4
44-
env:
45-
cache-name: cache-node-modules
24+
- uses: actions/setup-node@v4
4625
with:
47-
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
48-
key: ${{ runner.os }}-pnpm-store-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }}
49-
restore-keys: |
50-
v1-${{ runner.os }}-pnpm-store-${{ env.cache-name }}-
51-
v1-${{ runner.os }}-pnpm-store-
52-
v1-${{ runner.os }}-
26+
cache: pnpm
27+
node-version: lts/*
5328

5429
- name: Install project dependencies
5530
run: pnpm install

‎.github/workflows/e2e-ct.yml

+15-152
Original file line numberDiff line numberDiff line change
@@ -17,61 +17,21 @@ jobs:
1717
env:
1818
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
1919
TURBO_TEAM: ${{ vars.TURBO_TEAM }}
20-
strategy:
21-
fail-fast: false
22-
matrix:
23-
# Be sure to update all instances in this file and `pr-cleanup.yml` if updated
24-
project: [chromium, firefox, webkit]
2520
steps:
2621
- uses: actions/checkout@v4
27-
- uses: actions/setup-node@v4
28-
with:
29-
node-version: 18
30-
3122
- uses: pnpm/action-setup@v4
32-
name: Install pnpm
33-
id: pnpm-install
34-
with:
35-
run_install: false
36-
37-
- name: Get pnpm store directory
38-
id: pnpm-cache
39-
shell: bash
40-
run: |
41-
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
42-
43-
- name: Cache node modules
44-
id: cache-node-modules
45-
uses: actions/cache@v4
46-
env:
47-
cache-name: cache-node-modules
23+
- uses: actions/setup-node@v4
4824
with:
49-
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
50-
key: ${{ runner.os }}-pnpm-store-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }}
51-
restore-keys: |
52-
v1-${{ runner.os }}-pnpm-store-${{ env.cache-name }}-
53-
v1-${{ runner.os }}-pnpm-store-
54-
v1-${{ runner.os }}-
25+
cache: pnpm
26+
node-version: lts/*
5527

5628
- name: Install project dependencies
5729
run: pnpm install
5830

5931
- name: Build packages
32+
# This warms up the turborepo remote cache
6033
run: pnpm build --output-logs=full --log-order=grouped
6134

62-
# Caches build from either PR or next
63-
- name: Cache build
64-
id: cache-e2e-build
65-
uses: actions/cache@v4
66-
env:
67-
cache-name: cache-e2e-build
68-
with:
69-
path: |
70-
./*
71-
!**/node_modules/**
72-
# Unique key for a workflow run. Should be invalidated in the next run
73-
key: ${{ runner.os }}-${{ matrix.project }}-${{ env.cache-name }}-${{ github.run_id }}
74-
7535
playwright-ct-test:
7636
timeout-minutes: 30
7737
needs: [install]
@@ -82,41 +42,17 @@ jobs:
8242
strategy:
8343
fail-fast: false
8444
matrix:
85-
# Be sure to update all instances in this file and `pr-cleanup.yml` if updated
8645
project: [chromium, firefox, webkit]
87-
# Add more shards here if needed
46+
# Add more shards here if needed, but remember that the github required checks will have to be updated as well
8847
shardIndex: [1, 2]
8948
shardTotal: [2]
9049
steps:
9150
- uses: actions/checkout@v4
92-
- uses: actions/setup-node@v4
93-
with:
94-
node-version: 18
95-
9651
- uses: pnpm/action-setup@v4
97-
name: Install pnpm
98-
id: pnpm-install
99-
with:
100-
run_install: false
101-
102-
- name: Get pnpm store directory
103-
id: pnpm-cache
104-
shell: bash
105-
run: |
106-
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
107-
108-
- name: Cache node modules
109-
id: cache-node-modules
110-
uses: actions/cache@v4
111-
env:
112-
cache-name: cache-node-modules
52+
- uses: actions/setup-node@v4
11353
with:
114-
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
115-
key: ${{ runner.os }}-pnpm-store-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }}
116-
restore-keys: |
117-
v1-${{ runner.os }}-pnpm-store-${{ env.cache-name }}-
118-
v1-${{ runner.os }}-pnpm-store-
119-
v1-${{ runner.os }}-
54+
cache: pnpm
55+
node-version: lts/*
12056

12157
- name: Install project dependencies
12258
run: pnpm install
@@ -136,21 +72,12 @@ jobs:
13672
- name: Install Playwright Browsers
13773
# TODO: Fix webkit caching when downloading from cache
13874
# for some reason it doesn't work without installing again
139-
# if: steps.cache-playwright-browsers.outputs.cache-hit != 'true'
75+
if: steps.cache-playwright-browsers.outputs.cache-hit != 'true' || matrix.project == 'webkit'
14076
run: npx playwright install --with-deps
14177

142-
- name: Restore build cache
143-
uses: actions/cache/restore@v4
144-
id: restore-build
145-
env:
146-
cache-name: cache-e2e-build
147-
with:
148-
path: |
149-
./*
150-
!**/node_modules/**
151-
key: ${{ runner.os }}-${{ matrix.project }}-${{ env.cache-name }}-${{ github.run_id }}
152-
# If the cached build from the pervious step is not available. Fail the build
153-
fail-on-cache-miss: true
78+
- name: Build packages
79+
# This should take only a few seconds as it'll restore the remote cache that got primed in the `install` job
80+
run: pnpm build --output-logs=full --log-order=grouped
15481

15582
- name: Run end-to-end tests
15683
env:
@@ -171,34 +98,11 @@ jobs:
17198
runs-on: ubuntu-latest
17299
steps:
173100
- uses: actions/checkout@v4
174-
- uses: actions/setup-node@v4
175-
with:
176-
node-version: 18
177-
178101
- uses: pnpm/action-setup@v4
179-
name: Install pnpm
180-
id: pnpm-install
181-
with:
182-
run_install: false
183-
184-
- name: Get pnpm store directory
185-
id: pnpm-cache
186-
shell: bash
187-
run: |
188-
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
189-
190-
- name: Cache node modules
191-
id: cache-node-modules
192-
uses: actions/cache@v4
193-
env:
194-
cache-name: cache-node-modules
102+
- uses: actions/setup-node@v4
195103
with:
196-
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
197-
key: ${{ runner.os }}-pnpm-store-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }}
198-
restore-keys: |
199-
v1-${{ runner.os }}-pnpm-store-${{ env.cache-name }}-
200-
v1-${{ runner.os }}-pnpm-store-
201-
v1-${{ runner.os }}-
104+
cache: pnpm
105+
node-version: lts/*
202106

203107
- name: Install project dependencies
204108
run: pnpm install
@@ -213,15 +117,6 @@ jobs:
213117
- name: Merge into HTML Report
214118
run: npx playwright merge-reports --reporter json ${{ github.workspace }}/packages/sanity/playwright-ct/playwright-ct-report >> ${{ github.workspace }}/packages/sanity/playwright-ct/playwright-ct-report/playwright-ct-test-results.json
215119

216-
- name: Get Current Job Log URL
217-
uses: Tiryoh/gha-jobid-action@be260d8673c9211a84cdcf37794ebd654ba81eef # v1
218-
id: job_html_url
219-
if: always()
220-
with:
221-
github_token: ${{ secrets.GITHUB_TOKEN }}
222-
# Get the first run's ID even though it might be correct it should bring to the right place
223-
job_name: "playwright-ct-test (chromium, 1, 2)"
224-
225120
- uses: actions/upload-artifact@v4
226121
if: always()
227122
with:
@@ -231,35 +126,3 @@ jobs:
231126
${{ github.workspace }}/packages/sanity/playwright-ct/playwright-ct-report
232127
${{ github.workspace }}/packages/sanity/playwright-ct/results
233128
retention-days: 30
234-
235-
cleanup:
236-
permissions:
237-
contents: read
238-
actions: write # needed to delete the cache
239-
timeout-minutes: 30
240-
name: Cleanup (${{ matrix.project }})
241-
runs-on: ubuntu-latest
242-
needs: [playwright-ct-test]
243-
244-
strategy:
245-
# we want to know if a test fails on a specific node version
246-
fail-fast: false
247-
matrix:
248-
# Be sure to update all instances in this file and `pr-cleanup.yml` if updated
249-
project: [chromium, firefox, webkit]
250-
251-
steps:
252-
- name: Checkout
253-
uses: actions/checkout@v4
254-
255-
- name: Setup node
256-
uses: actions/setup-node@v4
257-
with:
258-
node-version: 18
259-
260-
# Delete the cache so it is only used once
261-
- name: Delete Cache
262-
run: gh cache delete ${{ runner.os }}-${{ matrix.project }}-${{ env.cache-name }}-${{ github.run_id }}
263-
env:
264-
cache-name: cache-e2e-build
265-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)
Please sign in to comment.