Skip to content

Commit 36fa379

Browse files
eatonphileatonphil
committed
Fix up caches
1 parent 4bda79e commit 36fa379

File tree

1 file changed

+133
-39
lines changed

1 file changed

+133
-39
lines changed

‎.github/workflows/pull_requests.yml‎

Lines changed: 133 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,18 @@ jobs:
1414
with:
1515
ref: ${{ github.ref }}
1616

17-
- uses: c-hive/gha-yarn-cache@v2
17+
- name: Get yarn cache directory path
18+
id: yarn-cache-dir-path
19+
run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
20+
21+
- uses: actions/cache@v3
22+
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
23+
with:
24+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
25+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
26+
restore-keys: |
27+
${{ runner.os }}-yarn-
28+
1829
- name: Setup Golang caches
1930
uses: actions/cache@v3
2031
with:
@@ -47,7 +58,18 @@ jobs:
4758
with:
4859
ref: ${{ github.ref }}
4960

50-
- uses: c-hive/gha-yarn-cache@v2
61+
- name: Get yarn cache directory path
62+
id: yarn-cache-dir-path
63+
run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
64+
65+
- uses: actions/cache@v3
66+
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
67+
with:
68+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
69+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
70+
restore-keys: |
71+
${{ runner.os }}-yarn-
72+
5173
- name: Setup Golang caches
5274
uses: actions/cache@v3
5375
with:
@@ -78,7 +100,18 @@ jobs:
78100
with:
79101
ref: ${{ github.ref }}
80102

81-
- uses: c-hive/gha-yarn-cache@v2
103+
- name: Get yarn cache directory path
104+
id: yarn-cache-dir-path
105+
run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
106+
107+
- uses: actions/cache@v3
108+
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
109+
with:
110+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
111+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
112+
restore-keys: |
113+
${{ runner.os }}-yarn-
114+
82115
- name: Setup Golang caches
83116
uses: actions/cache@v3
84117
with:
@@ -103,16 +136,26 @@ jobs:
103136
with:
104137
ref: ${{ github.ref }}
105138

106-
- uses: c-hive/gha-yarn-cache@v2
107-
- name: Setup Golang caches
108-
uses: actions/cache@v3
139+
- name: Get yarn cache directory path
140+
id: yarn-cache-dir-path
141+
run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
142+
143+
- uses: actions/cache@v3
144+
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
145+
with:
146+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
147+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
148+
restore-keys: |
149+
${{ runner.os }}-yarn-
150+
151+
- uses: actions/cache@v3
109152
with:
110153
path: |
111-
~/.cache/go-build
112-
~/go/pkg/mod
113-
key: ${{ runner.os }}-golang-${{ hashFiles('**/go.sum') }}
154+
~\AppData\Local\go-build
155+
~\go\pkg\mod
156+
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
114157
restore-keys: |
115-
${{ runner.os }}-golang-
158+
${{ runner.os }}-go-
116159
117160
- run: ./scripts/ci/prepare_windows.ps1
118161
shell: pwsh
@@ -130,7 +173,18 @@ jobs:
130173
with:
131174
ref: ${{ github.ref }}
132175

133-
- uses: c-hive/gha-yarn-cache@v2
176+
- name: Get yarn cache directory path
177+
id: yarn-cache-dir-path
178+
run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
179+
180+
- uses: actions/cache@v3
181+
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
182+
with:
183+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
184+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
185+
restore-keys: |
186+
${{ runner.os }}-yarn-
187+
134188
- name: Setup Golang caches
135189
uses: actions/cache@v3
136190
with:
@@ -218,18 +272,17 @@ jobs:
218272
with:
219273
ref: ${{ github.ref }}
220274

221-
- name: Setup Golang caches
222-
uses: actions/cache@v3
275+
- uses: actions/cache@v3
223276
with:
224277
path: |
225-
~/.cache/go-build
278+
~/Library/Caches/go-build
226279
~/go/pkg/mod
227-
key: ${{ runner.os }}-golang-${{ hashFiles('**/go.sum') }}
280+
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
228281
restore-keys: |
229-
${{ runner.os }}-golang-
230-
282+
${{ runner.os }}-go-
283+
231284
- run: ./scripts/ci/prepare_macos.sh
232-
285+
233286
- run: cd runner && go test
234287

235288
windows_go_tests:
@@ -241,15 +294,14 @@ jobs:
241294
with:
242295
ref: ${{ github.ref }}
243296

244-
- name: Setup Golang caches
245-
uses: actions/cache@v3
297+
- uses: actions/cache@v3
246298
with:
247299
path: |
248-
~/.cache/go-build
249-
~/go/pkg/mod
250-
key: ${{ runner.os }}-golang-${{ hashFiles('**/go.sum') }}
300+
~\AppData\Local\go-build
301+
~\go\pkg\mod
302+
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
251303
restore-keys: |
252-
${{ runner.os }}-golang-
304+
${{ runner.os }}-go-
253305
254306
- run: ./scripts/ci/prepare_windows.ps1
255307
shell: pwsh
@@ -265,7 +317,18 @@ jobs:
265317
with:
266318
ref: ${{ github.ref }}
267319

268-
- uses: c-hive/gha-yarn-cache@v2
320+
- name: Get yarn cache directory path
321+
id: yarn-cache-dir-path
322+
run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
323+
324+
- uses: actions/cache@v3
325+
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
326+
with:
327+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
328+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
329+
restore-keys: |
330+
${{ runner.os }}-yarn-
331+
269332
- name: Setup Golang caches
270333
uses: actions/cache@v3
271334
with:
@@ -293,16 +356,26 @@ jobs:
293356
with:
294357
ref: ${{ github.ref }}
295358

296-
- uses: c-hive/gha-yarn-cache@v2
297-
- name: Setup Golang caches
298-
uses: actions/cache@v3
359+
- name: Get yarn cache directory path
360+
id: yarn-cache-dir-path
361+
run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
362+
363+
- uses: actions/cache@v3
364+
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
365+
with:
366+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
367+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
368+
restore-keys: |
369+
${{ runner.os }}-yarn-
370+
371+
- uses: actions/cache@v3
299372
with:
300373
path: |
301-
~/.cache/go-build
374+
~/Library/Caches/go-build
302375
~/go/pkg/mod
303-
key: ${{ runner.os }}-golang-${{ hashFiles('**/go.sum') }}
376+
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
304377
restore-keys: |
305-
${{ runner.os }}-golang-
378+
${{ runner.os }}-go-
306379
307380
- run: ./scripts/ci/prepare_macos.sh
308381
# Needed so we can have ./build/desktop_runner.js ready for tests
@@ -323,16 +396,26 @@ jobs:
323396
with:
324397
ref: ${{ github.ref }}
325398

326-
- uses: c-hive/gha-yarn-cache@v2
327-
- name: Setup Golang caches
328-
uses: actions/cache@v3
399+
- name: Get yarn cache directory path
400+
id: yarn-cache-dir-path
401+
run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
402+
403+
- uses: actions/cache@v3
404+
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
405+
with:
406+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
407+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
408+
restore-keys: |
409+
${{ runner.os }}-yarn-
410+
411+
- uses: actions/cache@v3
329412
with:
330413
path: |
331-
~/.cache/go-build
332-
~/go/pkg/mod
333-
key: ${{ runner.os }}-golang-${{ hashFiles('**/go.sum') }}
414+
~\AppData\Local\go-build
415+
~\go\pkg\mod
416+
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
334417
restore-keys: |
335-
${{ runner.os }}-golang-
418+
${{ runner.os }}-go-
336419
337420
- run: ./scripts/ci/prepare_windows.ps1
338421
shell: pwsh
@@ -353,7 +436,18 @@ jobs:
353436
with:
354437
ref: ${{ github.ref }}
355438

356-
- uses: c-hive/gha-yarn-cache@v2
439+
- name: Get yarn cache directory path
440+
id: yarn-cache-dir-path
441+
run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
442+
443+
- uses: actions/cache@v3
444+
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
445+
with:
446+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
447+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
448+
restore-keys: |
449+
${{ runner.os }}-yarn-
450+
357451
- name: Setup Golang caches
358452
uses: actions/cache@v3
359453
with:

0 commit comments

Comments
 (0)