Skip to content

Commit b4589af

Browse files
committed
using cache2 instead of lighthouse
1 parent 67d55e4 commit b4589af

File tree

1 file changed

+30
-12
lines changed

1 file changed

+30
-12
lines changed

script/vsts/platforms/macos.yml

Lines changed: 30 additions & 12 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,12 +45,12 @@ 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'
48+
# - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
49+
# displayName: Save node_modules cache
50+
# inputs:
51+
# keyfile: 'package.json, script/vsts/platforms/macos.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json'
52+
# targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
53+
# vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
4554

4655
- script: script/lint
4756
displayName: Run linter
@@ -121,12 +130,21 @@ jobs:
121130
- script: npm install --global [email protected]
122131
displayName: Update npm
123132

124-
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
125-
displayName: Restore node_modules cache
133+
134+
- task: Cache@2
126135
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'
136+
key: 'Bootstrapped | "$(Agent.OS)" | package-lock.json'
137+
restoreKeys: |
138+
Bootstrapped | "$(Agent.OS)"
139+
path: "."
140+
condition: ne(variables['CacheRestored'], 'true')
141+
142+
# - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
143+
# displayName: Restore node_modules cache
144+
# inputs:
145+
# keyfile: 'package.json, script/vsts/platforms/macos.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json'
146+
# targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
147+
# vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
130148

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

0 commit comments

Comments
 (0)