Skip to content

Commit ef893f0

Browse files
joaomorenojoaomoreno
committed
Revert build perf
1 parent 8cbdf09 commit ef893f0

20 files changed

Lines changed: 314 additions & 287 deletions

‎build/.cachesalt‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎build/azure-pipelines/compile.yml‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
steps:
2+
- task: AzureKeyVault@1
3+
displayName: 'Azure Key Vault: Get Secrets'
4+
inputs:
5+
azureSubscription: 'vscode-builds-subscription'
6+
KeyVaultName: vscode
7+
8+
- task: NodeTool@0
9+
inputs:
10+
versionSpec: "10.15.1"
11+
12+
- script: |
13+
set -e
14+
cat << EOF > ~/.netrc
15+
machine monacotools.visualstudio.com
16+
password $(devops-pat)
17+
machine github.com
18+
login vscode
19+
password $(github-distro-mixin-password)
20+
EOF
21+
git config user.email "vscode@microsoft.com"
22+
git config user.name "VSCode"
23+
displayName: Prepare tooling
24+
25+
- script: |
26+
set -e
27+
git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
28+
git fetch distro
29+
git merge $(node -p "require('./package.json').distro")
30+
displayName: Merge distro
31+
32+
# - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
33+
# inputs:
34+
# keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
35+
# targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
36+
# vstsFeed: '$(ArtifactFeed)'
37+
38+
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
39+
inputs:
40+
versionSpec: "1.10.1"
41+
42+
- script: 'yarn --frozen-lockfile'
43+
displayName: Install Dependencies
44+
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
45+
46+
# - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
47+
# inputs:
48+
# keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
49+
# targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
50+
# vstsFeed: '$(ArtifactFeed)'
51+
# condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
52+
53+
- script: 'yarn gulp mixin'
54+
displayName: Mix in quality
55+
56+
- script: 'yarn gulp hygiene'
57+
displayName: Run hygiene checks
58+
59+
- script: 'yarn monaco-compile-check'
60+
displayName: Run Monaco compilation checks
61+
62+
- script: |
63+
set -e
64+
cd $BUILD_STAGINGDIRECTORY
65+
git clone https://github.com/microsoft/vscode-telemetry-extractor.git
66+
cd vscode-telemetry-extractor
67+
git checkout 3b04aba5bfdfcca1a5426cd2c51a90d18740d0bc
68+
npm i
69+
npm run setup-extension-repos
70+
node ./out/cli-extract.js --sourceDir $BUILD_SOURCESDIRECTORY --excludedDirPattern extensions --outputDir . --applyEndpoints --includeIsMeasurement --patchWebsiteEvents
71+
node ./out/cli-extract-extensions.js --sourceDir ./src/telemetry-sources --outputDir . --applyEndpoints --includeIsMeasurement
72+
mkdir -p $BUILD_SOURCESDIRECTORY/.build/telemetry
73+
mv declarations-resolved.json $BUILD_SOURCESDIRECTORY/.build/telemetry/telemetry-core.json
74+
mv declarations-extensions-resolved.json $BUILD_SOURCESDIRECTORY/.build/telemetry/telemetry-extensions.json
75+
displayName: Extract Telemetry
76+
77+
- script: 'VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" ./build/azure-pipelines/linux/build.sh'
78+
displayName: Build

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

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,4 @@
11
steps:
2-
- script: |
3-
mkdir -p .build
4-
echo -n $BUILD_SOURCEVERSION > .build/commit
5-
displayName: Prepare cache flag
6-
7-
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
8-
inputs:
9-
keyfile: '.build/commit'
10-
targetfolder: '.build, **/out-build, **/out-vscode-min, **/out-vscode-reh-min, **/out-vscode-web-min'
11-
vstsFeed: 'npm-vscode'
12-
platformIndependent: true
13-
alias: 'Compilation'
14-
15-
- script: |
16-
set -e
17-
exit 1
18-
displayName: Check RestoreCache
19-
condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
20-
212
- task: NodeTool@0
223
inputs:
234
versionSpec: "10.15.1"
@@ -56,19 +37,19 @@ steps:
5637

5738
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
5839
inputs:
59-
keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, quality/*/package.json, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
40+
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
6041
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
6142
vstsFeed: 'npm-vscode'
6243

6344
- script: |
6445
set -e
65-
CHILD_CONCURRENCY=1 yarn --frozen-lockfile
46+
yarn --frozen-lockfile
6647
displayName: Install dependencies
6748
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
6849

6950
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
7051
inputs:
71-
keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, quality/*/package.json, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
52+
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
7253
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
7354
vstsFeed: 'npm-vscode'
7455
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
@@ -79,25 +60,41 @@ steps:
7960
displayName: Run postinstall scripts
8061
condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
8162

63+
- script: |
64+
set -e
65+
yarn gulp mixin
66+
displayName: Mix in quality
67+
68+
- script: |
69+
set -e
70+
yarn gulp hygiene
71+
yarn monaco-compile-check
72+
displayName: Run hygiene checks
73+
condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
74+
8275
- script: |
8376
set -e
8477
node build/azure-pipelines/common/installDistroDependencies.js
8578
node build/azure-pipelines/common/installDistroDependencies.js remote
86-
displayName: Install distro dependencies
79+
node build/lib/builtInExtensions.js
80+
displayName: Install distro dependencies and extensions
8781

8882
- script: |
8983
set -e
90-
yarn gulp mixin
91-
displayName: Mix in quality
84+
./build/azure-pipelines/common/extract-telemetry.sh
85+
displayName: Extract Telemetry
9286

9387
- script: |
9488
set -e
89+
yarn gulp compile-build
90+
yarn gulp compile-extensions-build-legacy
91+
yarn gulp compile-extensions-build
9592
VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
96-
yarn gulp vscode-darwin-min-ci
93+
yarn gulp vscode-darwin-ci
9794
VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
98-
yarn gulp vscode-reh-darwin-min-ci
95+
yarn gulp vscode-reh-darwin-ci
9996
VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
100-
yarn gulp vscode-web-darwin-min-ci
97+
yarn gulp vscode-web-darwin-ci
10198
AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
10299
yarn gulp upload-vscode-sourcemaps
103100
displayName: Build

build/azure-pipelines/linux/multiarch/alpine/build.sh renamed to build/azure-pipelines/linux/build-alpine.sh

File renamed without changes.

build/azure-pipelines/linux/multiarch/alpine/prebuild.sh renamed to build/azure-pipelines/linux/build-arm.sh

File renamed without changes.

build/azure-pipelines/linux/multiarch/alpine/publish.sh renamed to build/azure-pipelines/linux/prebuild-alpine.sh

File renamed without changes.

build/azure-pipelines/linux/multiarch/armhf/build.sh renamed to build/azure-pipelines/linux/prebuild-arm.sh

File renamed without changes.

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

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
steps:
2+
- task: NodeTool@0
3+
inputs:
4+
versionSpec: "10.15.1"
5+
6+
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
7+
inputs:
8+
versionSpec: "1.10.1"
9+
10+
- task: AzureKeyVault@1
11+
displayName: 'Azure Key Vault: Get Secrets'
12+
inputs:
13+
azureSubscription: 'vscode-builds-subscription'
14+
KeyVaultName: vscode
15+
16+
- task: Docker@1
17+
displayName: 'Pull image'
18+
inputs:
19+
azureSubscriptionEndpoint: 'vscode-builds-subscription'
20+
azureContainerRegistry: vscodehub.azurecr.io
21+
command: 'Run an image'
22+
imageName: 'vscode-linux-build-agent:alpine'
23+
containerCommand: uname
24+
25+
- script: |
26+
set -e
27+
28+
cat << EOF > ~/.netrc
29+
machine monacotools.visualstudio.com
30+
password $(devops-pat)
31+
machine github.com
32+
login vscode
33+
password $(github-distro-mixin-password)
34+
EOF
35+
36+
git config user.email "vscode@microsoft.com"
37+
git config user.name "VSCode"
38+
displayName: Prepare tooling
39+
40+
- script: |
41+
set -e
42+
git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
43+
git fetch distro
44+
git merge $(node -p "require('./package.json').distro")
45+
displayName: Merge distro
46+
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+
53+
- script: |
54+
set -e
55+
yarn --frozen-lockfile
56+
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'))
71+
72+
- script: |
73+
set -e
74+
yarn gulp mixin
75+
displayName: Mix in quality
76+
77+
- script: |
78+
set -e
79+
yarn gulp hygiene
80+
yarn monaco-compile-check
81+
displayName: Run hygiene checks
82+
condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
83+
84+
- script: |
85+
set -e
86+
./build/azure-pipelines/linux/prebuild-alpine.sh
87+
displayName: Prepare build
88+
89+
- script: |
90+
set -e
91+
yarn gulp compile-build
92+
yarn gulp compile-extensions-build-legacy
93+
yarn gulp compile-extensions-build
94+
./build/azure-pipelines/linux/build-alpine.sh
95+
displayName: Build
96+
97+
- script: |
98+
set -e
99+
AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
100+
AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
101+
VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
102+
VSCODE_HOCKEYAPP_TOKEN="$(vscode-hockeyapp-token)" \
103+
./build/azure-pipelines/linux/publish-alpine.sh
104+
displayName: Publish
105+
106+
- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
107+
displayName: 'Component Detection'
108+
continueOnError: true

build/azure-pipelines/linux/product-build-linux-multiarch.yml renamed to build/azure-pipelines/linux/product-build-linux-arm.yml

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,4 @@
11
steps:
2-
- script: |
3-
mkdir -p .build
4-
echo -n $BUILD_SOURCEVERSION > .build/commit
5-
displayName: Prepare cache flag
6-
7-
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
8-
inputs:
9-
keyfile: '.build/commit'
10-
targetfolder: '.build, **/out-build, **/out-vscode-min, **/out-vscode-reh-min, **/out-vscode-web-min'
11-
vstsFeed: 'npm-vscode'
12-
platformIndependent: true
13-
alias: 'Compilation'
14-
15-
- script: |
16-
set -e
17-
exit 1
18-
displayName: Check RestoreCache
19-
condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
20-
212
- task: NodeTool@0
223
inputs:
234
versionSpec: "10.15.1"
@@ -38,7 +19,7 @@ steps:
3819
azureSubscriptionEndpoint: 'vscode-builds-subscription'
3920
azureContainerRegistry: vscodehub.azurecr.io
4021
command: 'Run an image'
41-
imageName: 'vscode-linux-build-agent:$(VSCODE_ARCH)'
22+
imageName: 'vscode-linux-build-agent:armhf'
4223
containerCommand: uname
4324

4425
- script: |
@@ -65,19 +46,19 @@ steps:
6546

6647
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
6748
inputs:
68-
keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, quality/*/package.json, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
49+
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
6950
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
7051
vstsFeed: 'npm-vscode'
7152

7253
- script: |
7354
set -e
74-
CHILD_CONCURRENCY=1 yarn --frozen-lockfile
55+
yarn --frozen-lockfile
7556
displayName: Install dependencies
7657
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
7758

7859
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
7960
inputs:
80-
keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, quality/*/package.json, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
61+
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
8162
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
8263
vstsFeed: 'npm-vscode'
8364
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
@@ -95,12 +76,22 @@ steps:
9576

9677
- script: |
9778
set -e
98-
./build/azure-pipelines/linux/multiarch/$(VSCODE_ARCH)/prebuild.sh
79+
yarn gulp hygiene
80+
yarn monaco-compile-check
81+
displayName: Run hygiene checks
82+
condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
83+
84+
- script: |
85+
set -e
86+
./build/azure-pipelines/linux/prebuild-arm.sh
9987
displayName: Prebuild
10088

10189
- script: |
10290
set -e
103-
./build/azure-pipelines/linux/multiarch/$(VSCODE_ARCH)/build.sh
91+
yarn gulp compile-build
92+
yarn gulp compile-extensions-build-legacy
93+
yarn gulp compile-extensions-build
94+
./build/azure-pipelines/linux/build-arm.sh
10495
displayName: Build
10596

10697
- script: |
@@ -109,7 +100,7 @@ steps:
109100
AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
110101
VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
111102
VSCODE_HOCKEYAPP_TOKEN="$(vscode-hockeyapp-token)" \
112-
./build/azure-pipelines/linux/multiarch/$(VSCODE_ARCH)/publish.sh
103+
./build/azure-pipelines/linux/publish-arm.sh
113104
displayName: Publish
114105

115106
- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0

0 commit comments

Comments
 (0)