Skip to content

Commit f5d3ca0

Browse files
joaomorenojoaomoreno
committed
Merge branch 'joao/build-perf'
2 parents 9622565 + 5ed3bb2 commit f5d3ca0

10 files changed

Lines changed: 79 additions & 17 deletions

‎build/azure-pipelines/compile.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ steps:
3131

3232
# - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
3333
# inputs:
34-
# keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
34+
# keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
3535
# targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
3636
# vstsFeed: '$(ArtifactFeed)'
3737

@@ -45,7 +45,7 @@ steps:
4545

4646
# - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
4747
# inputs:
48-
# keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
48+
# keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
4949
# targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
5050
# vstsFeed: '$(ArtifactFeed)'
5151
# condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))

‎build/azure-pipelines/darwin/continuous-build-darwin.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ steps:
44
versionSpec: "10.15.1"
55
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
66
inputs:
7-
keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
7+
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
88
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
99
vstsFeed: '$(ArtifactFeed)'
1010
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
@@ -16,7 +16,7 @@ steps:
1616
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
1717
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
1818
inputs:
19-
keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
19+
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
2020
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
2121
vstsFeed: '$(ArtifactFeed)'
2222
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))

‎build/azure-pipelines/darwin/product-build-darwin.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ steps:
3737

3838
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
3939
inputs:
40-
keyfile: '**/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
40+
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
4141
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
4242
vstsFeed: 'npm-vscode'
4343

@@ -49,11 +49,17 @@ steps:
4949

5050
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
5151
inputs:
52-
keyfile: '**/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
52+
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
5353
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
5454
vstsFeed: 'npm-vscode'
5555
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
5656

57+
- script: |
58+
set -e
59+
yarn postinstall
60+
displayName: Run postinstall scripts
61+
condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
62+
5763
- script: |
5864
set -e
5965
yarn gulp mixin

‎build/azure-pipelines/linux/continuous-build-linux.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ steps:
1212
versionSpec: "10.15.1"
1313
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
1414
inputs:
15-
keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
15+
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
1616
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
1717
vstsFeed: '$(ArtifactFeed)'
1818
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
@@ -24,7 +24,7 @@ steps:
2424
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
2525
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
2626
inputs:
27-
keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
27+
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
2828
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
2929
vstsFeed: '$(ArtifactFeed)'
3030
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))

‎build/azure-pipelines/linux/product-build-linux-alpine.yml‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,30 @@ steps:
4444
git merge $(node -p "require('./package.json').distro")
4545
displayName: Merge distro
4646

47+
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
48+
inputs:
49+
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
50+
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
51+
vstsFeed: 'npm-vscode'
52+
4753
- script: |
4854
set -e
49-
CHILD_CONCURRENCY=1 yarn --frozen-lockfile
55+
yarn --frozen-lockfile
5056
displayName: Install dependencies
57+
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
58+
59+
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
60+
inputs:
61+
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
62+
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
63+
vstsFeed: 'npm-vscode'
64+
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
65+
66+
- script: |
67+
set -e
68+
yarn postinstall
69+
displayName: Run postinstall scripts
70+
condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
5171

5272
- script: |
5373
set -e

‎build/azure-pipelines/linux/product-build-linux-arm.yml‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,30 @@ steps:
4444
git merge $(node -p "require('./package.json').distro")
4545
displayName: Merge distro
4646

47+
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
48+
inputs:
49+
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
50+
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
51+
vstsFeed: 'npm-vscode'
52+
4753
- script: |
4854
set -e
49-
CHILD_CONCURRENCY=1 yarn --frozen-lockfile
55+
yarn --frozen-lockfile
5056
displayName: Install dependencies
57+
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
58+
59+
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
60+
inputs:
61+
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
62+
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
63+
vstsFeed: 'npm-vscode'
64+
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
65+
66+
- script: |
67+
set -e
68+
yarn postinstall
69+
displayName: Run postinstall scripts
70+
condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
5171

5272
- script: |
5373
set -e

‎build/azure-pipelines/linux/product-build-linux.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ steps:
3838

3939
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
4040
inputs:
41-
keyfile: '**/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
41+
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
4242
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
4343
vstsFeed: 'npm-vscode'
4444

@@ -50,11 +50,17 @@ steps:
5050

5151
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
5252
inputs:
53-
keyfile: '**/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
53+
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
5454
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
5555
vstsFeed: 'npm-vscode'
5656
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
5757

58+
- script: |
59+
set -e
60+
yarn postinstall
61+
displayName: Run postinstall scripts
62+
condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
63+
5864
- script: |
5965
set -e
6066
yarn gulp mixin

‎build/azure-pipelines/product-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ resources:
77
image: snapcore/snapcraft:stable
88

99
jobs:
10-
# - job: Linux
10+
# - job: Compile
1111
# pool:
1212
# vmImage: 'Ubuntu-16.04'
1313
# steps:

‎build/azure-pipelines/win32/continuous-build-win32.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ steps:
1111
addToPath: true
1212
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
1313
inputs:
14-
keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
14+
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
1515
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
1616
vstsFeed: '$(ArtifactFeed)'
1717
- powershell: |
@@ -20,7 +20,7 @@ steps:
2020
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
2121
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
2222
inputs:
23-
keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
23+
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
2424
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
2525
vstsFeed: '$(ArtifactFeed)'
2626
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))

‎build/azure-pipelines/win32/product-build-win32.yml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ steps:
2525
2626
exec { git config user.email "vscode@microsoft.com" }
2727
exec { git config user.name "VSCode" }
28+
29+
mkdir .build -ea 0
30+
echo $(VSCODE_ARCH) > .build\arch
2831
displayName: Prepare tooling
2932

3033
- powershell: |
@@ -37,7 +40,7 @@ steps:
3740

3841
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
3942
inputs:
40-
keyfile: '**/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
43+
keyfile: '.build/arch, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
4144
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
4245
vstsFeed: 'npm-vscode'
4346

@@ -52,11 +55,18 @@ steps:
5255

5356
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
5457
inputs:
55-
keyfile: '**/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
58+
keyfile: '.build/arch, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
5659
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
5760
vstsFeed: 'npm-vscode'
5861
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
5962

63+
- powershell: |
64+
. build/azure-pipelines/win32/exec.ps1
65+
$ErrorActionPreference = "Stop"
66+
exec { yarn postinstall }
67+
displayName: Run postinstall scripts
68+
condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
69+
6070
- powershell: |
6171
. build/azure-pipelines/win32/exec.ps1
6272
$ErrorActionPreference = "Stop"

0 commit comments

Comments
 (0)