Skip to content

Commit 171d9cb

Browse files
jriekenjrieken
committed
Merge branch 'master' into joh/e5host
2 parents 0db668a + 26b10b2 commit 171d9cb

255 files changed

Lines changed: 4943 additions & 3503 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ steps:
22
- script: |
33
mkdir -p .build
44
echo -n $BUILD_SOURCEVERSION > .build/commit
5+
echo -n $VSCODE_QUALITY > .build/quality
56
displayName: Prepare cache flag
67

78
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
89
inputs:
9-
keyfile: 'build/.cachesalt, .build/commit'
10+
keyfile: 'build/.cachesalt, .build/commit, .build/quality'
1011
targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
1112
vstsFeed: 'npm-vscode'
1213
platformIndependent: true

‎build/azure-pipelines/linux/multiarch/arm64/build.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/env bash
2+
set -e
3+
echo 'noop'

‎build/azure-pipelines/linux/multiarch/arm64/prebuild.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/env bash
2+
set -e
3+
echo 'noop'

‎build/azure-pipelines/linux/multiarch/arm64/publish.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/env bash
2+
set -e
3+
echo 'noop'

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ steps:
22
- script: |
33
mkdir -p .build
44
echo -n $BUILD_SOURCEVERSION > .build/commit
5+
echo -n $VSCODE_QUALITY > .build/quality
56
displayName: Prepare cache flag
67

78
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
89
inputs:
9-
keyfile: 'build/.cachesalt, .build/commit'
10+
keyfile: 'build/.cachesalt, .build/commit, .build/quality'
1011
targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
1112
vstsFeed: 'npm-vscode'
1213
platformIndependent: true
@@ -112,4 +113,4 @@ steps:
112113

113114
- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
114115
displayName: 'Component Detection'
115-
continueOnError: true
116+
continueOnError: true

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ steps:
22
- script: |
33
mkdir -p .build
44
echo -n $BUILD_SOURCEVERSION > .build/commit
5+
echo -n $VSCODE_QUALITY > .build/quality
56
displayName: Prepare cache flag
67

78
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
89
inputs:
9-
keyfile: 'build/.cachesalt, .build/commit'
10+
keyfile: 'build/.cachesalt, .build/commit, .build/quality'
1011
targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
1112
vstsFeed: 'npm-vscode'
1213
platformIndependent: true

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,17 @@ jobs:
6666
steps:
6767
- template: linux/product-build-linux-multiarch.yml
6868

69+
- job: LinuxArm64
70+
condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_LINUX_ARM64'], 'true'), ne(variables['VSCODE_QUALITY'], 'stable'))
71+
pool:
72+
vmImage: 'Ubuntu-16.04'
73+
variables:
74+
VSCODE_ARCH: arm64
75+
dependsOn:
76+
- Compile
77+
steps:
78+
- template: linux/product-build-linux-multiarch.yml
79+
6980
- job: LinuxAlpine
7081
condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_LINUX_ALPINE'], 'true'), ne(variables['VSCODE_QUALITY'], 'stable'))
7182
pool:
@@ -129,6 +140,7 @@ jobs:
129140
- template: sync-mooncake.yml
130141

131142
trigger: none
143+
pr: none
132144

133145
schedules:
134146
- cron: "0 5 * * Mon-Fri"

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ steps:
22
- script: |
33
mkdir -p .build
44
echo -n $BUILD_SOURCEVERSION > .build/commit
5+
echo -n $VSCODE_QUALITY > .build/quality
56
displayName: Prepare cache flag
67

78
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
89
inputs:
9-
keyfile: 'build/.cachesalt, .build/commit'
10+
keyfile: 'build/.cachesalt, .build/commit, .build/quality'
1011
targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
1112
vstsFeed: 'npm-vscode'
1213
platformIndependent: true
@@ -116,9 +117,9 @@ steps:
116117

117118
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
118119
inputs:
119-
keyfile: 'build/.cachesalt, .build/commit'
120+
keyfile: 'build/.cachesalt, .build/commit, .build/quality'
120121
targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
121122
vstsFeed: 'npm-vscode'
122123
platformIndependent: true
123124
alias: 'Compilation'
124-
condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
125+
condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))

‎build/azure-pipelines/upload-sourcemaps.js‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,37 @@ const util = require('../lib/util');
1313
const root = path.dirname(path.dirname(__dirname));
1414
const commit = util.getVersion(root);
1515

16-
function main() {
17-
const vs = vfs.src('out-vscode-min/**/*.map', { base: 'out-vscode-min' }) // client source-maps only
16+
// optionally allow to pass in explicit base/maps to upload
17+
const [, , base, maps] = process.argv;
18+
19+
const fetch = function (base, maps = `${base}/**/*.map`) {
20+
return vfs.src(maps, { base })
1821
.pipe(es.mapSync(f => {
1922
f.path = `${f.base}/core/${f.relative}`;
2023
return f;
2124
}));
25+
};
26+
27+
function main() {
28+
const sources = [];
29+
30+
// vscode client maps (default)
31+
if (!base) {
32+
const vs = fetch('out-vscode-min'); // client source-maps only
33+
sources.push(vs);
34+
35+
const extensionsOut = vfs.src(['.build/extensions/**/*.js.map', '!**/node_modules/**'], { base: '.build' });
36+
sources.push(extensionsOut);
37+
}
2238

23-
const extensionsOut = vfs.src(['.build/extensions/**/*.js.map', '!**/node_modules/**'], { base: '.build' });
39+
// specific client base/maps
40+
else {
41+
sources.push(fetch(base, maps));
42+
}
2443

25-
return es.merge(vs, extensionsOut)
44+
return es.merge(...sources)
2645
.pipe(es.through(function (data) {
27-
// debug
28-
console.log('Uploading Sourcemap', data.relative);
46+
console.log('Uploading Sourcemap', data.relative); // debug
2947
this.emit('data', data);
3048
}))
3149
.pipe(azure.upload({
@@ -36,4 +54,4 @@ function main() {
3654
}));
3755
}
3856

39-
main();
57+
main();

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ steps:
22
- script: |
33
mkdir -p .build
44
echo -n $BUILD_SOURCEVERSION > .build/commit
5+
echo -n $VSCODE_QUALITY > .build/quality
56
displayName: Prepare cache flag
67

78
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
89
inputs:
9-
keyfile: 'build/.cachesalt, .build/commit'
10+
keyfile: 'build/.cachesalt, .build/commit, .build/quality'
1011
targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
1112
vstsFeed: 'npm-vscode'
1213
platformIndependent: true
@@ -87,6 +88,15 @@ steps:
8788
yarn gulp vscode-web-min-ci
8889
displayName: Build
8990

91+
# upload only the workbench.web.api.js source maps because
92+
# we just compiled these bits in the previous step and the
93+
# general task to upload source maps has already been run
94+
- script: |
95+
set -e
96+
AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
97+
node build/azure-pipelines/upload-sourcemaps out-vscode-web-min out-vscode-web-min/vs/workbench/workbench.web.api.js.map
98+
displayName: Upload sourcemaps (Web)
99+
90100
- script: |
91101
set -e
92102
AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \

0 commit comments

Comments
 (0)