Skip to content

Commit e9d80d9

Browse files
potetopoteto
authored
Revert "[ci] Fix node_modules cache glob (facebook#32604)" (facebook#32606)
This reverts commit ef1103d. --- [//]: # (BEGIN SAPLING FOOTER) Stack created with [Sapling](https://sapling-scm.com). Best reviewed with [ReviewStack](https://reviewstack.dev/facebook/react/pull/32606). * facebook#32609 * facebook#32608 * facebook#32607 * __->__ facebook#32606
1 parent ef1103d commit e9d80d9

10 files changed

+62
-93
lines changed

‎.github/workflows/compiler_playground.yml‎

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

‎.github/workflows/compiler_prereleases.yml‎

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

‎.github/workflows/compiler_typescript.yml‎

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

@@ -67,9 +66,8 @@ jobs:
6766
uses: actions/cache@v4
6867
id: node_modules
6968
with:
70-
path: |
71-
**/node_modules
72-
key: compiler-node_modules-v2-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('compiler/**/yarn.lock') }}
69+
path: "**/node_modules"
70+
key: compiler-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('compiler/**/yarn.lock') }}
7371
- run: yarn install --frozen-lockfile
7472
- run: yarn workspace babel-plugin-react-compiler jest
7573

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

‎.github/workflows/devtools_regression_tests.yml‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ jobs:
2929
uses: actions/cache@v4
3030
id: node_modules
3131
with:
32-
path: |
33-
**/node_modules
34-
key: runtime-release-node_modules-v2-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'scripts/release/yarn.lock') }}
32+
path: "**/node_modules"
33+
key: runtime-release-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'scripts/release/yarn.lock') }}
3534
- name: Ensure clean build directory
3635
run: rm -rf build
3736
- run: yarn install --frozen-lockfile
@@ -64,9 +63,8 @@ jobs:
6463
uses: actions/cache@v4
6564
id: node_modules
6665
with:
67-
path: |
68-
**/node_modules
69-
key: runtime-node_modules-v2-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
66+
path: "**/node_modules"
67+
key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
7068
- name: Ensure clean build directory
7169
run: rm -rf build
7270
- run: yarn install --frozen-lockfile
@@ -122,9 +120,8 @@ jobs:
122120
uses: actions/cache@v4
123121
id: node_modules
124122
with:
125-
path: |
126-
**/node_modules
127-
key: runtime-node_modules-v2-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
123+
path: "**/node_modules"
124+
key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
128125
- run: yarn install --frozen-lockfile
129126
- name: Restore all archived build artifacts
130127
uses: actions/download-artifact@v4
@@ -157,9 +154,8 @@ jobs:
157154
uses: actions/cache@v4
158155
id: node_modules
159156
with:
160-
path: |
161-
**/node_modules
162-
key: runtime-node_modules-v2-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
157+
path: "**/node_modules"
158+
key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
163159
- run: yarn install --frozen-lockfile
164160
- name: Restore all archived build artifacts
165161
uses: actions/download-artifact@v4

‎.github/workflows/runtime_build_and_test.yml‎

Lines changed: 28 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,8 @@ jobs:
5555
uses: actions/cache@v4
5656
id: node_modules
5757
with:
58-
path: |
59-
**/node_modules
60-
key: runtime-node_modules-v2-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
58+
path: "**/node_modules"
59+
key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
6160
- name: Ensure clean build directory
6261
run: rm -rf build
6362
- run: yarn install --frozen-lockfile
@@ -80,9 +79,8 @@ jobs:
8079
uses: actions/cache@v4
8180
id: node_modules
8281
with:
83-
path: |
84-
**/node_modules
85-
key: runtime-node_modules-v2-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
82+
path: "**/node_modules"
83+
key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
8684
- name: Ensure clean build directory
8785
run: rm -rf build
8886
- run: yarn install --frozen-lockfile
@@ -109,9 +107,8 @@ jobs:
109107
uses: actions/cache@v4
110108
id: node_modules
111109
with:
112-
path: |
113-
**/node_modules
114-
key: runtime-node_modules-v2-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
110+
path: "**/node_modules"
111+
key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
115112
- name: Ensure clean build directory
116113
run: rm -rf build
117114
- run: yarn install --frozen-lockfile
@@ -165,9 +162,8 @@ jobs:
165162
uses: actions/cache@v4
166163
id: node_modules
167164
with:
168-
path: |
169-
**/node_modules
170-
key: runtime-node_modules-v2-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
165+
path: "**/node_modules"
166+
key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
171167
- name: Ensure clean build directory
172168
run: rm -rf build
173169
- run: yarn install --frozen-lockfile
@@ -202,9 +198,8 @@ jobs:
202198
uses: actions/cache@v4
203199
id: node_modules
204200
with:
205-
path: |
206-
**/node_modules
207-
key: runtime-node_modules-v2-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
201+
path: "**/node_modules"
202+
key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
208203
- name: Ensure clean build directory
209204
run: rm -rf build
210205
- run: yarn install --frozen-lockfile
@@ -279,9 +274,8 @@ jobs:
279274
uses: actions/cache@v4
280275
id: node_modules
281276
with:
282-
path: |
283-
**/node_modules
284-
key: runtime-node_modules-v2-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
277+
path: "**/node_modules"
278+
key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
285279
- name: Ensure clean build directory
286280
run: rm -rf build
287281
- run: yarn install --frozen-lockfile
@@ -314,9 +308,8 @@ jobs:
314308
uses: actions/cache@v4
315309
id: node_modules
316310
with:
317-
path: |
318-
**/node_modules
319-
key: runtime-node_modules-v2-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
311+
path: "**/node_modules"
312+
key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
320313
- name: Ensure clean build directory
321314
run: rm -rf build
322315
- run: yarn install --frozen-lockfile
@@ -364,9 +357,8 @@ jobs:
364357
uses: actions/cache@v4
365358
id: node_modules
366359
with:
367-
path: |
368-
**/node_modules
369-
key: runtime-node_modules-v2-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
360+
path: "**/node_modules"
361+
key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
370362
- name: Ensure clean build directory
371363
run: rm -rf build
372364
- run: yarn install --frozen-lockfile
@@ -402,9 +394,8 @@ jobs:
402394
uses: actions/cache@v4
403395
id: node_modules
404396
with:
405-
path: |
406-
**/node_modules
407-
key: runtime-node_modules-v2-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
397+
path: "**/node_modules"
398+
key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
408399
- name: Ensure clean build directory
409400
run: rm -rf build
410401
- run: yarn install --frozen-lockfile
@@ -437,9 +428,8 @@ jobs:
437428
uses: actions/cache@v4
438429
id: node_modules
439430
with:
440-
path: |
441-
**/node_modules
442-
key: fixtures_dom-node_modules-v2-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('fixtures/dom/yarn.lock') }}
431+
path: "**/node_modules"
432+
key: fixtures_dom-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('fixtures/dom/yarn.lock') }}
443433
- name: Ensure clean build directory
444434
run: rm -rf build
445435
- run: yarn install --frozen-lockfile
@@ -481,9 +471,8 @@ jobs:
481471
uses: actions/cache@v4
482472
id: node_modules
483473
with:
484-
path: |
485-
**/node_modules
486-
key: fixtures_flight-node_modules-v2-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
474+
path: "**/node_modules"
475+
key: fixtures_flight-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
487476
- name: Ensure clean build directory
488477
run: rm -rf build
489478
- run: yarn install --frozen-lockfile
@@ -546,9 +535,8 @@ jobs:
546535
uses: actions/cache@v4
547536
id: node_modules
548537
with:
549-
path: |
550-
**/node_modules
551-
key: runtime-node_modules-v2-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
538+
path: "**/node_modules"
539+
key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
552540
- name: Ensure clean build directory
553541
run: rm -rf build
554542
- run: yarn install --frozen-lockfile
@@ -600,9 +588,8 @@ jobs:
600588
uses: actions/cache@v4
601589
id: node_modules
602590
with:
603-
path: |
604-
**/node_modules
605-
key: runtime-node_modules-v2-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
591+
path: "**/node_modules"
592+
key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
606593
- name: Ensure clean build directory
607594
run: rm -rf build
608595
- run: yarn install --frozen-lockfile
@@ -640,9 +627,8 @@ jobs:
640627
uses: actions/cache@v4
641628
id: node_modules
642629
with:
643-
path: |
644-
**/node_modules
645-
key: runtime-node_modules-v2-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
630+
path: "**/node_modules"
631+
key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
646632
- name: Ensure clean build directory
647633
run: rm -rf build
648634
- run: yarn install --frozen-lockfile

‎.github/workflows/runtime_commit_artifacts.yml‎

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

‎.github/workflows/runtime_eslint_plugin_e2e.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,8 @@ jobs:
4040
uses: actions/cache@v4
4141
id: node_modules
4242
with:
43-
path: |
44-
**/node_modules
45-
key: runtime-eslint_e2e-node_modules-v2-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
43+
path: "**/node_modules"
44+
key: runtime-eslint_e2e-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
4645
- name: Ensure clean build directory
4746
run: rm -rf build
4847
- run: yarn install --frozen-lockfile

‎.github/workflows/runtime_prereleases.yml‎

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

‎.github/workflows/runtime_releases_from_npm_manual.yml‎

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

‎.github/workflows/shared_lint.yml‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@ jobs:
2828
- name: Restore cached node_modules
2929
uses: actions/cache@v4
3030
with:
31-
path: |
32-
**/node_modules
33-
key: shared-lint-node_modules-v2-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
31+
path: "**/node_modules"
32+
key: shared-lint-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
3433
- name: Ensure clean build directory
3534
run: rm -rf build
3635
- run: yarn install --frozen-lockfile
@@ -49,9 +48,8 @@ jobs:
4948
- name: Restore cached node_modules
5049
uses: actions/cache@v4
5150
with:
52-
path: |
53-
**/node_modules
54-
key: shared-lint-node_modules-v2-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
51+
path: "**/node_modules"
52+
key: shared-lint-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
5553
- name: Ensure clean build directory
5654
run: rm -rf build
5755
- run: yarn install --frozen-lockfile
@@ -70,9 +68,8 @@ jobs:
7068
- name: Restore cached node_modules
7169
uses: actions/cache@v4
7270
with:
73-
path: |
74-
**/node_modules
75-
key: shared-lint-node_modules-v2-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
71+
path: "**/node_modules"
72+
key: shared-lint-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
7673
- name: Ensure clean build directory
7774
run: rm -rf build
7875
- run: yarn install --frozen-lockfile
@@ -91,9 +88,8 @@ jobs:
9188
- name: Restore cached node_modules
9289
uses: actions/cache@v4
9390
with:
94-
path: |
95-
**/node_modules
96-
key: shared-lint-node_modules-v2-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
91+
path: "**/node_modules"
92+
key: shared-lint-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
9793
- name: Ensure clean build directory
9894
run: rm -rf build
9995
- run: yarn install --frozen-lockfile

0 commit comments

Comments
 (0)