28
28
uses : actions/cache@v2
29
29
with :
30
30
path : ' **/node_modules'
31
- key : ${{ runner.os }}-cacheNodeModules2 -${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
32
- restore-keys : ${{ runner.os }}-cacheNodeModules2 -
31
+ key : ${{ runner.os }}-cacheNodeModules3 -${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
32
+ restore-keys : ${{ runner.os }}-cacheNodeModules3 -
33
33
- name : Get yarn cache directory path
34
34
id : yarnCacheDirPath
35
35
if : ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
70
70
uses : actions/cache@v2
71
71
with :
72
72
path : ' **/node_modules'
73
- key : ${{ runner.os }}-cacheNodeModules2 -${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
74
- restore-keys : ${{ runner.os }}-cacheNodeModules2 -
73
+ key : ${{ runner.os }}-cacheNodeModules3 -${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
74
+ restore-keys : ${{ runner.os }}-cacheNodeModules3 -
75
75
- name : Get yarn cache directory path
76
76
id : yarnCacheDirPath
77
77
if : ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
@@ -123,8 +123,8 @@ jobs:
123
123
uses : actions/cache@v2
124
124
with :
125
125
path : ' **/node_modules'
126
- key : ${{ runner.os }}-cacheNodeModules2 -${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
127
- restore-keys : ${{ runner.os }}-cacheNodeModules2 -
126
+ key : ${{ runner.os }}-cacheNodeModules3 -${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
127
+ restore-keys : ${{ runner.os }}-cacheNodeModules3 -
128
128
- name : Get yarn cache directory path
129
129
id : yarnCacheDirPath
130
130
if : ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
@@ -181,8 +181,8 @@ jobs:
181
181
uses : actions/cache@v2
182
182
with :
183
183
path : ' **/node_modules'
184
- key : ${{ runner.os }}-cacheNodeModules2 -${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
185
- restore-keys : ${{ runner.os }}-cacheNodeModules2 -
184
+ key : ${{ runner.os }}-cacheNodeModules3 -${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
185
+ restore-keys : ${{ runner.os }}-cacheNodeModules3 -
186
186
187
187
- name : Restore compiled core code
188
188
id : cacheCompiledCoreCode
@@ -243,8 +243,8 @@ jobs:
243
243
uses : actions/cache@v2
244
244
with :
245
245
path : ' **/node_modules'
246
- key : ${{ runner.os }}-cacheNodeModules2 -${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
247
- restore-keys : ${{ runner.os }}-cacheNodeModules2 -
246
+ key : ${{ runner.os }}-cacheNodeModules3 -${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
247
+ restore-keys : ${{ runner.os }}-cacheNodeModules3 -
248
248
249
249
- name : Restore compiled core code
250
250
id : cacheCompiledCoreCode
@@ -271,9 +271,8 @@ jobs:
271
271
- name : Run Integration Tests (Electron)
272
272
run : DISPLAY=:10 ./scripts/test-integration.sh --build
273
273
274
- build-darwin-unit-tests :
275
- name : " Build: macOS Unit Tests"
276
- needs : [build-compile-core, build-compile-extensions]
274
+ build-darwin-node-modules :
275
+ name : " Build: macOS Node Modules"
277
276
runs-on : macos-latest
278
277
env :
279
278
GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
@@ -289,8 +288,8 @@ jobs:
289
288
uses : actions/cache@v2
290
289
with :
291
290
path : ' **/node_modules'
292
- key : ${{ runner.os }}-cacheNodeModules2 -${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
293
- restore-keys : ${{ runner.os }}-cacheNodeModules2 -
291
+ key : ${{ runner.os }}-cacheNodeModules3 -${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
292
+ restore-keys : ${{ runner.os }}-cacheNodeModules3 -
294
293
- name : Get yarn cache directory path
295
294
id : yarnCacheDirPath
296
295
if : ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
@@ -308,6 +307,27 @@ jobs:
308
307
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD : 1
309
308
run : yarn --frozen-lockfile
310
309
310
+ build-darwin-unit-tests :
311
+ name : " Build: macOS Unit Tests"
312
+ needs : [build-compile-core, build-compile-extensions, build-darwin-node-modules]
313
+ runs-on : macos-latest
314
+ env :
315
+ GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
316
+ steps :
317
+ - uses : actions/checkout@v2
318
+
319
+ - uses : actions/setup-node@v2-beta
320
+ with :
321
+ node-version : 12
322
+
323
+ - name : Restore cached node modules
324
+ id : cacheNodeModules
325
+ uses : actions/cache@v2
326
+ with :
327
+ path : ' **/node_modules'
328
+ key : ${{ runner.os }}-cacheNodeModules3-${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
329
+ restore-keys : ${{ runner.os }}-cacheNodeModules3-
330
+
311
331
- name : Restore compiled core code
312
332
id : cacheCompiledCoreCode
313
333
uses : actions/cache@v2
@@ -341,7 +361,7 @@ jobs:
341
361
342
362
build-darwin-integration-tests :
343
363
name : " Build: macOS Integration Tests"
344
- needs : [build-compile-core, build-compile-extensions]
364
+ needs : [build-compile-core, build-compile-extensions, build-darwin-node-modules ]
345
365
runs-on : macos-latest
346
366
env :
347
367
GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
@@ -352,29 +372,13 @@ jobs:
352
372
with :
353
373
node-version : 12
354
374
355
- - name : Cache node modules
375
+ - name : Restore cached node modules
356
376
id : cacheNodeModules
357
377
uses : actions/cache@v2
358
378
with :
359
379
path : ' **/node_modules'
360
- key : ${{ runner.os }}-cacheNodeModules2-${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
361
- restore-keys : ${{ runner.os }}-cacheNodeModules2-
362
- - name : Get yarn cache directory path
363
- id : yarnCacheDirPath
364
- if : ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
365
- run : echo "::set-output name=dir::$(yarn cache dir)"
366
- - name : Cache yarn directory
367
- if : ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
368
- uses : actions/cache@v2
369
- with :
370
- path : ${{ steps.yarnCacheDirPath.outputs.dir }}
371
- key : ${{ runner.os }}-yarnCacheDir-${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
372
- restore-keys : ${{ runner.os }}-yarnCacheDir-
373
- - name : Execute yarn
374
- if : ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
375
- env :
376
- PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD : 1
377
- run : yarn --frozen-lockfile
380
+ key : ${{ runner.os }}-cacheNodeModules3-${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
381
+ restore-keys : ${{ runner.os }}-cacheNodeModules3-
378
382
379
383
- name : Restore compiled core code
380
384
id : cacheCompiledCoreCode
@@ -403,7 +407,7 @@ jobs:
403
407
404
408
build-darwin-smoke-tests :
405
409
name : " Build: macOS Smoke Tests"
406
- needs : [build-compile-core, build-compile-extensions]
410
+ needs : [build-compile-core, build-compile-extensions, build-darwin-node-modules ]
407
411
runs-on : macos-latest
408
412
env :
409
413
GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
@@ -414,29 +418,13 @@ jobs:
414
418
with :
415
419
node-version : 12
416
420
417
- - name : Cache node modules
421
+ - name : Restore cached node modules
418
422
id : cacheNodeModules
419
423
uses : actions/cache@v2
420
424
with :
421
425
path : ' **/node_modules'
422
- key : ${{ runner.os }}-cacheNodeModules2-${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
423
- restore-keys : ${{ runner.os }}-cacheNodeModules2-
424
- - name : Get yarn cache directory path
425
- id : yarnCacheDirPath
426
- if : ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
427
- run : echo "::set-output name=dir::$(yarn cache dir)"
428
- - name : Cache yarn directory
429
- if : ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
430
- uses : actions/cache@v2
431
- with :
432
- path : ${{ steps.yarnCacheDirPath.outputs.dir }}
433
- key : ${{ runner.os }}-yarnCacheDir-${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
434
- restore-keys : ${{ runner.os }}-yarnCacheDir-
435
- - name : Execute yarn
436
- if : ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
437
- env :
438
- PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD : 1
439
- run : yarn --frozen-lockfile
426
+ key : ${{ runner.os }}-cacheNodeModules3-${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
427
+ restore-keys : ${{ runner.os }}-cacheNodeModules3-
440
428
441
429
- name : Restore compiled core code
442
430
id : cacheCompiledCoreCode
@@ -492,8 +480,8 @@ jobs:
492
480
uses : actions/cache@v2
493
481
with :
494
482
path : ' **/node_modules'
495
- key : ${{ runner.os }}-cacheNodeModules2 -${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
496
- restore-keys : ${{ runner.os }}-cacheNodeModules2 -
483
+ key : ${{ runner.os }}-cacheNodeModules3 -${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
484
+ restore-keys : ${{ runner.os }}-cacheNodeModules3 -
497
485
- name : Get yarn cache directory path
498
486
id : yarnCacheDirPath
499
487
if : ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
@@ -558,8 +546,8 @@ jobs:
558
546
uses : actions/cache@v2
559
547
with :
560
548
path : ' **/node_modules'
561
- key : ${{ runner.os }}-cacheNodeModules2 -${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
562
- restore-keys : ${{ runner.os }}-cacheNodeModules2 -
549
+ key : ${{ runner.os }}-cacheNodeModules3 -${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
550
+ restore-keys : ${{ runner.os }}-cacheNodeModules3 -
563
551
- name : Get yarn cache directory path
564
552
id : yarnCacheDirPath
565
553
if : ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
@@ -606,8 +594,8 @@ jobs:
606
594
uses : actions/cache@v2
607
595
with :
608
596
path : ' **/node_modules'
609
- key : ${{ runner.os }}-cacheNodeModules2 -${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
610
- restore-keys : ${{ runner.os }}-cacheNodeModules2 -
597
+ key : ${{ runner.os }}-cacheNodeModules3 -${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
598
+ restore-keys : ${{ runner.os }}-cacheNodeModules3 -
611
599
- name : Get yarn cache directory path
612
600
id : yarnCacheDirPath
613
601
if : ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
@@ -654,8 +642,8 @@ jobs:
654
642
uses : actions/cache@v2
655
643
with :
656
644
path : ' **/node_modules'
657
- key : ${{ runner.os }}-cacheNodeModules2 -${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
658
- restore-keys : ${{ runner.os }}-cacheNodeModules2 -
645
+ key : ${{ runner.os }}-cacheNodeModules3 -${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
646
+ restore-keys : ${{ runner.os }}-cacheNodeModules3 -
659
647
- name : Execute yarn
660
648
if : ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
661
649
env :
0 commit comments