Skip to content

Commit 22858b9

Browse files
committed
using cache template in the workflows
1 parent bcc9e1d commit 22858b9

File tree

3 files changed

+12
-80
lines changed

3 files changed

+12
-80
lines changed

script/vsts/platforms/linux.yml

+3-20
Original file line numberDiff line numberDiff line change
@@ -30,26 +30,9 @@ jobs:
3030
- script: npm install --global [email protected]
3131
displayName: Update npm
3232

33-
- task: Cache@2
34-
displayName: Cache node_modules
35-
inputs:
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
33+
- template: cache.yml
34+
parameters:
35+
OS: linux
5336

5437
- script: script/bootstrap
5538
displayName: Bootstrap build environment

script/vsts/platforms/macos.yml

+6-40
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,9 @@ jobs:
2020
- script: npm install --global [email protected]
2121
displayName: Update npm
2222

23-
- task: Cache@2
24-
displayName: Cache node_modules
25-
inputs:
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
23+
- template: cache.yml
24+
parameters:
25+
OS: macos
4326

4427
- script: script/bootstrap
4528
displayName: Bootstrap build environment
@@ -128,26 +111,9 @@ jobs:
128111
- script: npm install --global [email protected]
129112
displayName: Update npm
130113

131-
- task: Cache@2
132-
displayName: Cache node_modules
133-
inputs:
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
114+
- template: cache.yml
115+
parameters:
116+
OS: macos
151117

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

script/vsts/platforms/windows.yml

+3-20
Original file line numberDiff line numberDiff line change
@@ -48,26 +48,9 @@ jobs:
4848
npm install
4949
displayName: Install Windows build dependencies
5050
51-
- task: Cache@2
52-
displayName: Cache node_modules
53-
inputs:
54-
key: 'npm | "$(Agent.OS)" | "$(buildArch)" | package.json, package-lock.json, script/vsts/platforms/windows.yml'
55-
path: 'node_modules'
56-
cacheHitVar: MainNodeModulesRestored
57-
58-
- task: Cache@2
59-
displayName: Cache script/node_modules
60-
inputs:
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
51+
- template: cache.yml
52+
parameters:
53+
OS: windows
7154

7255
- script: |
7356
node script\vsts\windows-run.js script\bootstrap.cmd

0 commit comments

Comments
 (0)