Skip to content

Commit 088ca32

Browse files
committed
cache2 on macos
1 parent ed875af commit 088ca32

File tree

1 file changed

+17
-13
lines changed

1 file changed

+17
-13
lines changed

script/vsts/platforms/macos.yml

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,16 @@ jobs:
2626
keyfile: 'package.json, script/vsts/platforms/macos.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json'
2727
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
2828
vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
29-
29+
30+
- task: Cache@2
31+
inputs:
32+
key: 'Bootstrapped | "$(Agent.OS)" | package-lock.json'
33+
restoreKeys: |
34+
Bootstrapped | "$(Agent.OS)"
35+
path: "."
36+
cacheHitVar: CacheRestored
37+
displayName: Cache Bootstrapped repository
38+
3039
- script: script/bootstrap
3140
displayName: Bootstrap build environment
3241
env:
@@ -36,13 +45,6 @@ jobs:
3645
npm_config_build_from_source: true
3746
condition: ne(variables['CacheRestored'], 'true')
3847

39-
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
40-
displayName: Save node_modules cache
41-
inputs:
42-
keyfile: 'package.json, script/vsts/platforms/macos.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json'
43-
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
44-
vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
45-
4648
- script: script/lint
4749
displayName: Run linter
4850

@@ -121,12 +123,14 @@ jobs:
121123
- script: npm install --global [email protected]
122124
displayName: Update npm
123125

124-
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
125-
displayName: Restore node_modules cache
126+
127+
- task: Cache@2
126128
inputs:
127-
keyfile: 'package.json, script/vsts/platforms/macos.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json'
128-
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
129-
vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
129+
key: 'Bootstrapped | "$(Agent.OS)" | package-lock.json'
130+
restoreKeys: |
131+
Bootstrapped | "$(Agent.OS)"
132+
path: "."
133+
condition: ne(variables['CacheRestored'], 'true')
130134

131135
# The artifact caching task does not work on forks, so we need to
132136
# bootstrap again for pull requests coming from forked repositories.

0 commit comments

Comments
 (0)