Skip to content

Commit fc4dc84

Browse files
DeeDeeGDeeDeeG
committed
CI: Use Cache@2 task in place of Lighthouse
1 parent d0f0f60 commit fc4dc84

File tree

3 files changed

+78
-62
lines changed

3 files changed

+78
-62
lines changed

‎script/vsts/platforms/linux.yml‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,26 @@ jobs:
3030
- script: npm install --global npm@6.12.1
3131
displayName: Update npm
3232

33-
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
34-
displayName: Restore node_modules cache
33+
- task: Cache@2
34+
displayName: Cache node_modules
3535
inputs:
36-
keyfile: 'package.json, script/vsts/platforms/linux.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json'
37-
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
38-
vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
36+
key: 'npm | "$(Agent.OS)" | package.json, package-lock.json, script/vsts/platforms/linux.yml'
37+
path: 'node_modules'
38+
cacheHitVar: MainNodeModulesRestored
39+
40+
- task: Cache@2
41+
displayName: Cache script/node_modules
42+
inputs:
43+
key: 'npm | "$(Agent.OS)" | script/package.json, script/package-lock.json, script/vsts/platforms/linux.yml'
44+
path: 'script/node_modules'
45+
cacheHitVar: ScriptNodeModulesRestored
46+
47+
- task: Cache@2
48+
displayName: Cache apm/node_modules
49+
inputs:
50+
key: 'npm | "$(Agent.OS)" | apm/package.json, apm/package-lock.json, script/vsts/platforms/linux.yml'
51+
path: 'apm/node_modules'
52+
cacheHitVar: ApmNodeModulesRestored
3953

4054
- script: script/bootstrap
4155
displayName: Bootstrap build environment
@@ -45,14 +59,7 @@ jobs:
4559
CC: clang-5.0
4660
CXX: clang++-5.0
4761
npm_config_clang: 1
48-
condition: ne(variables['CacheRestored'], 'true')
49-
50-
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
51-
displayName: Save node_modules cache
52-
inputs:
53-
keyfile: 'package.json, script/vsts/platforms/linux.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json'
54-
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
55-
vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
62+
condition: or(ne(variables['MainNodeModulesRestored'], 'true'), ne(variables['ScriptNodeModulesRestored'], 'true'), ne(variables['ApmNodeModulesRestored'], 'true'))
5663

5764
- script: script/lint
5865
displayName: Run linter

‎script/vsts/platforms/macos.yml‎

Lines changed: 40 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,26 @@ jobs:
2020
- script: npm install --global npm@6.12.1
2121
displayName: Update npm
2222

23-
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
24-
displayName: Restore node_modules cache
23+
- task: Cache@2
24+
displayName: Cache node_modules
2525
inputs:
26-
keyfile: 'package.json, script/vsts/platforms/macos.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json'
27-
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
28-
vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
26+
key: 'npm | "$(Agent.OS)" | package.json, package-lock.json, script/vsts/platforms/macos.yml'
27+
path: 'node_modules'
28+
cacheHitVar: MainNodeModulesRestored
29+
30+
- task: Cache@2
31+
displayName: Cache script/node_modules
32+
inputs:
33+
key: 'npm | "$(Agent.OS)" | script/package.json, script/package-lock.json, script/vsts/platforms/macos.yml'
34+
path: 'script/node_modules'
35+
cacheHitVar: ScriptNodeModulesRestored
36+
37+
- task: Cache@2
38+
displayName: Cache apm/node_modules
39+
inputs:
40+
key: 'npm | "$(Agent.OS)" | apm/package.json, apm/package-lock.json, script/vsts/platforms/macos.yml'
41+
path: 'apm/node_modules'
42+
cacheHitVar: ApmNodeModulesRestored
2943

3044
- script: script/bootstrap
3145
displayName: Bootstrap build environment
@@ -34,14 +48,7 @@ jobs:
3448
CI_PROVIDER: VSTS
3549
NPM_BIN_PATH: /usr/local/bin/npm
3650
npm_config_build_from_source: true
37-
condition: ne(variables['CacheRestored'], 'true')
38-
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'
51+
condition: or(ne(variables['MainNodeModulesRestored'], 'true'), ne(variables['ScriptNodeModulesRestored'], 'true'), ne(variables['ApmNodeModulesRestored'], 'true'))
4552

4653
- script: script/lint
4754
displayName: Run linter
@@ -121,12 +128,26 @@ jobs:
121128
- script: npm install --global npm@6.12.1
122129
displayName: Update npm
123130

124-
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
125-
displayName: Restore node_modules cache
131+
- task: Cache@2
132+
displayName: Cache node_modules
126133
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'
134+
key: 'npm | "$(Agent.OS)" | package.json, package-lock.json, script/vsts/platforms/macos.yml'
135+
path: 'node_modules'
136+
cacheHitVar: MainNodeModulesRestored
137+
138+
- task: Cache@2
139+
displayName: Cache script/node_modules
140+
inputs:
141+
key: 'npm | "$(Agent.OS)" | script/package.json, script/package-lock.json, script/vsts/platforms/macos.yml'
142+
path: 'script/node_modules'
143+
cacheHitVar: ScriptNodeModulesRestored
144+
145+
- task: Cache@2
146+
displayName: Cache apm/node_modules
147+
inputs:
148+
key: 'npm | "$(Agent.OS)" | apm/package.json, apm/package-lock.json, script/vsts/platforms/macos.yml'
149+
path: 'apm/node_modules'
150+
cacheHitVar: ApmNodeModulesRestored
130151

131152
# The artifact caching task does not work on forks, so we need to
132153
# bootstrap again for pull requests coming from forked repositories.
@@ -137,8 +158,7 @@ jobs:
137158
CI_PROVIDER: VSTS
138159
NPM_BIN_PATH: /usr/local/bin/npm
139160
npm_config_build_from_source: true
140-
141-
condition: ne(variables['CacheRestored'], 'true')
161+
condition: or(ne(variables['MainNodeModulesRestored'], 'true'), ne(variables['ScriptNodeModulesRestored'], 'true'), ne(variables['ApmNodeModulesRestored'], 'true'))
142162

143163
- task: DownloadBuildArtifacts@0
144164
displayName: Download atom-mac.zip

‎script/vsts/platforms/windows.yml‎

Lines changed: 18 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -48,21 +48,26 @@ jobs:
4848
npm install
4949
displayName: Install Windows build dependencies
5050
51-
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
52-
displayName: Restore node_modules cache (x64)
51+
- task: Cache@2
52+
displayName: Cache node_modules
5353
inputs:
54-
keyfile: 'package.json, script/vsts/platforms/windows.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json, script/vsts/x64-cache-key'
55-
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
56-
vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
57-
condition: eq(variables['buildArch'], 'x64')
54+
key: 'npm | "$(Agent.OS)" | "$(buildArch)" | package.json, package-lock.json, script/vsts/platforms/windows.yml'
55+
path: 'node_modules'
56+
cacheHitVar: MainNodeModulesRestored
5857

59-
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
60-
displayName: Restore node_modules cache (x86)
58+
- task: Cache@2
59+
displayName: Cache script/node_modules
6160
inputs:
62-
keyfile: 'package.json, script/vsts/platforms/windows.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json, script/vsts/x86-cache-key'
63-
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
64-
vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
65-
condition: eq(variables['buildArch'], 'x86')
61+
key: 'npm | "$(Agent.OS)" | "$(buildArch)" | script/package.json, script/package-lock.json, script/vsts/platforms/windows.yml'
62+
path: 'script/node_modules'
63+
cacheHitVar: ScriptNodeModulesRestored
64+
65+
- task: Cache@2
66+
displayName: Cache apm/node_modules
67+
inputs:
68+
key: 'npm | "$(Agent.OS)" | "$(buildArch)" | apm/package.json, apm/package-lock.json, script/vsts/platforms/windows.yml'
69+
path: 'apm/node_modules'
70+
cacheHitVar: ApmNodeModulesRestored
6671

6772
- script: |
6873
node script\vsts\windows-run.js script\bootstrap.cmd
@@ -73,23 +78,7 @@ jobs:
7378
NPM_BIN_PATH: "C:\\hostedtoolcache\\windows\\node\\12.13.1\\x64\\npm.cmd"
7479
npm_config_build_from_source: true
7580
displayName: Bootstrap build environment
76-
condition: ne(variables['CacheRestored'], 'true')
77-
78-
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
79-
displayName: Save node_modules cache (x64)
80-
inputs:
81-
keyfile: 'package.json, script/vsts/platforms/windows.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json, script/vsts/x64-cache-key'
82-
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
83-
vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
84-
condition: eq(variables['buildArch'], 'x64')
85-
86-
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
87-
displayName: Save node_modules cache (x86)
88-
inputs:
89-
keyfile: 'package.json, script/vsts/platforms/windows.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json, script/vsts/x86-cache-key'
90-
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
91-
vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2'
92-
condition: eq(variables['buildArch'], 'x86')
81+
condition: or(ne(variables['MainNodeModulesRestored'], 'true'), ne(variables['ScriptNodeModulesRestored'], 'true'), ne(variables['ApmNodeModulesRestored'], 'true'))
9382
9483
- script: node script\vsts\windows-run.js script\lint.cmd
9584
env:

0 commit comments

Comments
 (0)