Skip to content

Commit f3c9560

Browse files
potetopoteto
authored
[ci] Update node_modules cache path (#32609)
Alternative of #32604. Bust all old caches since I reverted some other changes to the keys.
1 parent 4eba294 commit f3c9560

10 files changed

+93
-62
lines changed

Diff for: ‎.github/workflows/compiler_playground.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ jobs:
3636
uses: actions/cache@v4
3737
id: node_modules
3838
with:
39-
path: "**/node_modules"
40-
key: compiler-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('compiler/**/yarn.lock') }}
39+
path: |
40+
**/node_modules
41+
key: compiler-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('compiler/**/yarn.lock') }}
4142
- run: yarn install --frozen-lockfile
4243
- run: npx playwright install --with-deps chromium
4344
- run: CI=true yarn test

Diff for: ‎.github/workflows/compiler_prereleases.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@ jobs:
4646
uses: actions/cache@v4
4747
id: node_modules
4848
with:
49-
path: "**/node_modules"
50-
key: compiler-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('compiler/**/yarn.lock') }}
49+
path: |
50+
**/node_modules
51+
key: compiler-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('compiler/**/yarn.lock') }}
5152
- run: yarn install --frozen-lockfile
5253
- name: Publish packages to npm
5354
run: |

Diff for: ‎.github/workflows/compiler_typescript.yml

+9-6
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@ jobs:
4646
- name: Restore cached node_modules
4747
uses: actions/cache@v4
4848
with:
49-
path: "**/node_modules"
50-
key: compiler-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('compiler/**/yarn.lock') }}
49+
path: |
50+
**/node_modules
51+
key: compiler-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('compiler/**/yarn.lock') }}
5152
- run: yarn install --frozen-lockfile
5253
- run: yarn workspace babel-plugin-react-compiler lint
5354

@@ -66,8 +67,9 @@ jobs:
6667
uses: actions/cache@v4
6768
id: node_modules
6869
with:
69-
path: "**/node_modules"
70-
key: compiler-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('compiler/**/yarn.lock') }}
70+
path: |
71+
**/node_modules
72+
key: compiler-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('compiler/**/yarn.lock') }}
7173
- run: yarn install --frozen-lockfile
7274
- run: yarn workspace babel-plugin-react-compiler jest
7375

@@ -90,8 +92,9 @@ jobs:
9092
uses: actions/cache@v4
9193
id: node_modules
9294
with:
93-
path: "**/node_modules"
94-
key: compiler-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('compiler/**/yarn.lock') }}
95+
path: |
96+
**/node_modules
97+
key: compiler-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('compiler/**/yarn.lock') }}
9598
- run: yarn install --frozen-lockfile
9699
- run: xvfb-run -a yarn workspace ${{ matrix.workspace_name }} test
97100
if: runner.os == 'Linux' && matrix.workspace_name == 'react-forgive'

Diff for: ‎.github/workflows/devtools_regression_tests.yml

+12-8
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ jobs:
2929
uses: actions/cache@v4
3030
id: node_modules
3131
with:
32-
path: "**/node_modules"
33-
key: runtime-release-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'scripts/release/yarn.lock') }}
32+
path: |
33+
**/node_modules
34+
key: runtime-release-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'scripts/release/yarn.lock') }}
3435
- name: Ensure clean build directory
3536
run: rm -rf build
3637
- run: yarn install --frozen-lockfile
@@ -63,8 +64,9 @@ jobs:
6364
uses: actions/cache@v4
6465
id: node_modules
6566
with:
66-
path: "**/node_modules"
67-
key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
67+
path: |
68+
**/node_modules
69+
key: runtime-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
6870
- name: Ensure clean build directory
6971
run: rm -rf build
7072
- run: yarn install --frozen-lockfile
@@ -120,8 +122,9 @@ jobs:
120122
uses: actions/cache@v4
121123
id: node_modules
122124
with:
123-
path: "**/node_modules"
124-
key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
125+
path: |
126+
**/node_modules
127+
key: runtime-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
125128
- run: yarn install --frozen-lockfile
126129
- name: Restore all archived build artifacts
127130
uses: actions/download-artifact@v4
@@ -154,8 +157,9 @@ jobs:
154157
uses: actions/cache@v4
155158
id: node_modules
156159
with:
157-
path: "**/node_modules"
158-
key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
160+
path: |
161+
**/node_modules
162+
key: runtime-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
159163
- run: yarn install --frozen-lockfile
160164
- name: Restore all archived build artifacts
161165
uses: actions/download-artifact@v4

Diff for: ‎.github/workflows/runtime_build_and_test.yml

+42-28
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,9 @@ jobs:
5555
uses: actions/cache@v4
5656
id: node_modules
5757
with:
58-
path: "**/node_modules"
59-
key: runtime-node_modules-v3-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
58+
path: |
59+
**/node_modules
60+
key: runtime-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
6061
- name: Ensure clean build directory
6162
run: rm -rf build
6263
- run: yarn install --frozen-lockfile
@@ -79,8 +80,9 @@ jobs:
7980
uses: actions/cache@v4
8081
id: node_modules
8182
with:
82-
path: "**/node_modules"
83-
key: runtime-node_modules-v3-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
83+
path: |
84+
**/node_modules
85+
key: runtime-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
8486
- name: Ensure clean build directory
8587
run: rm -rf build
8688
- run: yarn install --frozen-lockfile
@@ -105,8 +107,9 @@ jobs:
105107
uses: actions/cache@v4
106108
id: node_modules
107109
with:
108-
path: "**/node_modules"
109-
key: runtime-node_modules-v3-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
110+
path: |
111+
**/node_modules
112+
key: runtime-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
110113
- name: Ensure clean build directory
111114
run: rm -rf build
112115
- run: yarn install --frozen-lockfile
@@ -160,8 +163,9 @@ jobs:
160163
uses: actions/cache@v4
161164
id: node_modules
162165
with:
163-
path: "**/node_modules"
164-
key: runtime-and-compiler-node_modules-v3-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'compiler/yarn.lock') }}
166+
path: |
167+
**/node_modules
168+
key: runtime-and-compiler-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'compiler/yarn.lock') }}
165169
- name: Ensure clean build directory
166170
run: rm -rf build
167171
- run: yarn install --frozen-lockfile
@@ -198,8 +202,9 @@ jobs:
198202
uses: actions/cache@v4
199203
id: node_modules
200204
with:
201-
path: "**/node_modules"
202-
key: runtime-and-compiler-node_modules-v3-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'compiler/yarn.lock') }}
205+
path: |
206+
**/node_modules
207+
key: runtime-and-compiler-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'compiler/yarn.lock') }}
203208
- name: Ensure clean build directory
204209
run: rm -rf build
205210
- run: yarn install --frozen-lockfile
@@ -276,8 +281,9 @@ jobs:
276281
uses: actions/cache@v4
277282
id: node_modules
278283
with:
279-
path: "**/node_modules"
280-
key: runtime-and-compiler-node_modules-v3-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'compiler/yarn.lock') }}
284+
path: |
285+
**/node_modules
286+
key: runtime-and-compiler-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'compiler/yarn.lock') }}
281287
- name: Ensure clean build directory
282288
run: rm -rf build
283289
- run: yarn install --frozen-lockfile
@@ -310,8 +316,9 @@ jobs:
310316
uses: actions/cache@v4
311317
id: node_modules
312318
with:
313-
path: "**/node_modules"
314-
key: runtime-node_modules-v3-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
319+
path: |
320+
**/node_modules
321+
key: runtime-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
315322
- name: Ensure clean build directory
316323
run: rm -rf build
317324
- run: yarn install --frozen-lockfile
@@ -357,8 +364,9 @@ jobs:
357364
uses: actions/cache@v4
358365
id: node_modules
359366
with:
360-
path: "**/node_modules"
361-
key: runtime-node_modules-v3-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
367+
path: |
368+
**/node_modules
369+
key: runtime-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
362370
- name: Ensure clean build directory
363371
run: rm -rf build
364372
- run: yarn install --frozen-lockfile
@@ -392,8 +400,9 @@ jobs:
392400
uses: actions/cache@v4
393401
id: node_modules
394402
with:
395-
path: "**/node_modules"
396-
key: runtime-node_modules-v3-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
403+
path: |
404+
**/node_modules
405+
key: runtime-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
397406
- name: Ensure clean build directory
398407
run: rm -rf build
399408
- run: yarn install --frozen-lockfile
@@ -424,8 +433,9 @@ jobs:
424433
uses: actions/cache@v4
425434
id: node_modules
426435
with:
427-
path: "**/node_modules"
428-
key: fixtures_dom-node_modules-v3-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
436+
path: |
437+
**/node_modules
438+
key: fixtures_dom-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
429439
- name: Ensure clean build directory
430440
run: rm -rf build
431441
- run: yarn install --frozen-lockfile
@@ -467,8 +477,9 @@ jobs:
467477
uses: actions/cache@v4
468478
id: node_modules
469479
with:
470-
path: "**/node_modules"
471-
key: fixtures_flight-node_modules-v3-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
480+
path: |
481+
**/node_modules
482+
key: fixtures_flight-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
472483
- name: Ensure clean build directory
473484
run: rm -rf build
474485
- run: yarn install --frozen-lockfile
@@ -529,8 +540,9 @@ jobs:
529540
uses: actions/cache@v4
530541
id: node_modules
531542
with:
532-
path: "**/node_modules"
533-
key: runtime-node_modules-v3-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
543+
path: |
544+
**/node_modules
545+
key: runtime-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
534546
- name: Ensure clean build directory
535547
run: rm -rf build
536548
- run: yarn install --frozen-lockfile
@@ -580,8 +592,9 @@ jobs:
580592
uses: actions/cache@v4
581593
id: node_modules
582594
with:
583-
path: "**/node_modules"
584-
key: runtime-node_modules-v3-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
595+
path: |
596+
**/node_modules
597+
key: runtime-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
585598
- name: Ensure clean build directory
586599
run: rm -rf build
587600
- run: yarn install --frozen-lockfile
@@ -617,8 +630,9 @@ jobs:
617630
uses: actions/cache@v4
618631
id: node_modules
619632
with:
620-
path: "**/node_modules"
621-
key: runtime-node_modules-v3-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
633+
path: |
634+
**/node_modules
635+
key: runtime-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
622636
- name: Ensure clean build directory
623637
run: rm -rf build
624638
- run: yarn install --frozen-lockfile

Diff for: ‎.github/workflows/runtime_commit_artifacts.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,9 @@ jobs:
7373
uses: actions/cache@v4
7474
id: node_modules
7575
with:
76-
path: "**/node_modules"
77-
key: runtime-release-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'scripts/release/yarn.lock') }}
76+
path: |
77+
**/node_modules
78+
key: runtime-release-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'scripts/release/yarn.lock') }}
7879
- name: Ensure clean build directory
7980
run: rm -rf build
8081
- run: yarn install --frozen-lockfile

Diff for: ‎.github/workflows/runtime_eslint_plugin_e2e.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,9 @@ jobs:
4242
uses: actions/cache@v4
4343
id: node_modules
4444
with:
45-
path: "node_modules"
46-
key: runtime-and-compiler-eslint_e2e-node_modules-v3-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'compiler/yarn.lock') }}
45+
path: |
46+
**/node_modules
47+
key: runtime-and-compiler-eslint_e2e-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'compiler/yarn.lock') }}
4748
- name: Ensure clean build directory
4849
run: rm -rf build
4950
- run: yarn install --frozen-lockfile

Diff for: ‎.github/workflows/runtime_prereleases.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ jobs:
3939
uses: actions/cache@v4
4040
id: node_modules
4141
with:
42-
path: "**/node_modules"
43-
key: runtime-release-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'scripts/release/yarn.lock') }}
42+
path: |
43+
**/node_modules
44+
key: runtime-release-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'scripts/release/yarn.lock') }}
4445
- name: Ensure clean build directory
4546
run: rm -rf build
4647
- run: yarn install --frozen-lockfile

Diff for: ‎.github/workflows/runtime_releases_from_npm_manual.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,9 @@ jobs:
7171
uses: actions/cache@v4
7272
id: node_modules
7373
with:
74-
path: "**/node_modules"
75-
key: runtime-release-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'scripts/release/yarn.lock') }}
74+
path: |
75+
**/node_modules
76+
key: runtime-release-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'scripts/release/yarn.lock') }}
7677
- name: Ensure clean build directory
7778
run: rm -rf build
7879
- run: yarn install --frozen-lockfile

Diff for: ‎.github/workflows/shared_lint.yml

+12-8
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ jobs:
2828
- name: Restore cached node_modules
2929
uses: actions/cache@v4
3030
with:
31-
path: "**/node_modules"
32-
key: shared-lint-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
31+
path: |
32+
**/node_modules
33+
key: shared-lint-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
3334
- name: Ensure clean build directory
3435
run: rm -rf build
3536
- run: yarn install --frozen-lockfile
@@ -48,8 +49,9 @@ jobs:
4849
- name: Restore cached node_modules
4950
uses: actions/cache@v4
5051
with:
51-
path: "**/node_modules"
52-
key: shared-lint-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
52+
path: |
53+
**/node_modules
54+
key: shared-lint-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
5355
- name: Ensure clean build directory
5456
run: rm -rf build
5557
- run: yarn install --frozen-lockfile
@@ -68,8 +70,9 @@ jobs:
6870
- name: Restore cached node_modules
6971
uses: actions/cache@v4
7072
with:
71-
path: "**/node_modules"
72-
key: shared-lint-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
73+
path: |
74+
**/node_modules
75+
key: shared-lint-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
7376
- name: Ensure clean build directory
7477
run: rm -rf build
7578
- run: yarn install --frozen-lockfile
@@ -88,8 +91,9 @@ jobs:
8891
- name: Restore cached node_modules
8992
uses: actions/cache@v4
9093
with:
91-
path: "**/node_modules"
92-
key: shared-lint-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
94+
path: |
95+
**/node_modules
96+
key: shared-lint-node_modules-v5-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
9397
- name: Ensure clean build directory
9498
run: rm -rf build
9599
- run: yarn install --frozen-lockfile

0 commit comments

Comments
 (0)