Skip to content

Commit 7181bf6

Browse files
joaomorenojoaomoreno
committed
Merge branch 'master' into joao/build-cleanup
2 parents 66e14b8 + 7d4636e commit 7181bf6

26 files changed

Lines changed: 485 additions & 47 deletions

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@ out-vscode-min/
1818
out-vscode-reh/
1919
out-vscode-reh-min/
2020
out-vscode-reh-pkg/
21+
out-vscode-reh-web/
22+
out-vscode-reh-web-min/
23+
out-vscode-reh-web-pkg/
2124
out-vscode-web/
2225
out-vscode-web-min/
23-
out-vscode-web-pkg/
2426
src/vs/server
2527
resources/server
2628
build/node_modules

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ steps:
77
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
88
inputs:
99
keyfile: '.build/commit'
10-
targetfolder: '.build, **/out-build, **/out-vscode-min, **/out-vscode-reh-min, **/out-vscode-web-min'
10+
targetfolder: '.build, **/out-build, **/out-vscode-min, **/out-vscode-reh-min, **/out-vscode-reh-web-min'
1111
vstsFeed: 'npm-vscode'
1212
platformIndependent: true
1313
alias: 'Compilation'
@@ -89,7 +89,7 @@ steps:
8989
VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
9090
yarn gulp vscode-reh-darwin-min-ci
9191
VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
92-
yarn gulp vscode-web-darwin-min-ci
92+
yarn gulp vscode-reh-web-darwin-min-ci
9393
displayName: Build
9494

9595
- script: |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ steps:
77
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
88
inputs:
99
keyfile: '.build/commit'
10-
targetfolder: '.build, **/out-build, **/out-vscode-min, **/out-vscode-reh-min, **/out-vscode-web-min'
10+
targetfolder: '.build, **/out-build, **/out-vscode-min, **/out-vscode-reh-min, **/out-vscode-reh-web-min'
1111
vstsFeed: 'npm-vscode'
1212
platformIndependent: true
1313
alias: 'Compilation'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ steps:
77
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
88
inputs:
99
keyfile: '.build/commit'
10-
targetfolder: '.build, **/out-build, **/out-vscode-min, **/out-vscode-reh-min, **/out-vscode-web-min'
10+
targetfolder: '.build, **/out-build, **/out-vscode-min, **/out-vscode-reh-min, **/out-vscode-reh-web-min'
1111
vstsFeed: 'npm-vscode'
1212
platformIndependent: true
1313
alias: 'Compilation'
@@ -88,7 +88,7 @@ steps:
8888
VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
8989
yarn gulp vscode-reh-linux-x64-min-ci
9090
VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
91-
yarn gulp vscode-web-linux-x64-min-ci
91+
yarn gulp vscode-reh-web-linux-x64-min-ci
9292
displayName: Build
9393

9494
- script: |

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ resources:
88

99
jobs:
1010
- job: Compile
11-
timeoutInMinutes: 40
1211
pool:
1312
vmImage: 'Ubuntu-16.04'
1413
container: vscode-x64
@@ -17,7 +16,6 @@ jobs:
1716

1817
- job: Windows
1918
condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_WIN32'], 'true'))
20-
timeoutInMinutes: 50
2119
pool:
2220
vmImage: VS2017-Win2016
2321
variables:
@@ -29,7 +27,6 @@ jobs:
2927

3028
- job: Windows32
3129
condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_WIN32_32BIT'], 'true'))
32-
timeoutInMinutes: 50
3330
pool:
3431
vmImage: VS2017-Win2016
3532
variables:
@@ -41,7 +38,6 @@ jobs:
4138

4239
- job: Linux
4340
condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_LINUX'], 'true'))
44-
timeoutInMinutes: 30
4541
pool:
4642
vmImage: 'Ubuntu-16.04'
4743
container: vscode-x64
@@ -52,7 +48,6 @@ jobs:
5248

5349
- job: LinuxSnap
5450
condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_LINUX'], 'true'))
55-
timeoutInMinutes: 30
5651
pool:
5752
vmImage: 'Ubuntu-16.04'
5853
container: snapcraft
@@ -62,7 +57,6 @@ jobs:
6257

6358
- job: LinuxArmhf
6459
condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_LINUX_ARMHF'], 'true'), ne(variables['VSCODE_QUALITY'], 'stable'))
65-
timeoutInMinutes: 30
6660
pool:
6761
vmImage: 'Ubuntu-16.04'
6862
variables:
@@ -74,7 +68,6 @@ jobs:
7468

7569
- job: LinuxAlpine
7670
condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_LINUX_ALPINE'], 'true'), ne(variables['VSCODE_QUALITY'], 'stable'))
77-
timeoutInMinutes: 30
7871
pool:
7972
vmImage: 'Ubuntu-16.04'
8073
variables:
@@ -84,9 +77,19 @@ jobs:
8477
steps:
8578
- template: linux/product-build-linux-multiarch.yml
8679

80+
- job: LinuxWeb
81+
condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_WEB'], 'true'))
82+
pool:
83+
vmImage: 'Ubuntu-16.04'
84+
variables:
85+
VSCODE_ARCH: x64
86+
dependsOn:
87+
- Compile
88+
steps:
89+
- template: web/product-build-web.yml
90+
8791
- job: macOS
8892
condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_MACOS'], 'true'))
89-
timeoutInMinutes: 50
9093
pool:
9194
vmImage: macOS 10.13
9295
dependsOn:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ steps:
77
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
88
inputs:
99
keyfile: '.build/commit'
10-
targetfolder: '.build, **/out-build, **/out-vscode-min, **/out-vscode-reh-min, **/out-vscode-web-min'
10+
targetfolder: '.build, **/out-build, **/out-vscode-min, **/out-vscode-reh-min, **/out-vscode-reh-web-min'
1111
vstsFeed: 'npm-vscode'
1212
platformIndependent: true
1313
alias: 'Compilation'
@@ -103,7 +103,7 @@ steps:
103103
yarn gulp compile-extensions-build
104104
yarn gulp minify-vscode
105105
yarn gulp minify-vscode-reh
106-
yarn gulp minify-vscode-web
106+
yarn gulp minify-vscode-reh-web
107107
displayName: Compile
108108
condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
109109

@@ -117,7 +117,7 @@ steps:
117117
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
118118
inputs:
119119
keyfile: '.build/commit'
120-
targetfolder: '.build, **/out-build, **/out-vscode-min, **/out-vscode-reh-min, **/out-vscode-web-min'
120+
targetfolder: '.build, **/out-build, **/out-vscode-min, **/out-vscode-reh-min, **/out-vscode-reh-web-min'
121121
vstsFeed: 'npm-vscode'
122122
platformIndependent: true
123123
alias: 'Compilation'

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

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
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-reh-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+
21+
- task: NodeTool@0
22+
inputs:
23+
versionSpec: "10.15.1"
24+
25+
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
26+
inputs:
27+
versionSpec: "1.10.1"
28+
29+
- task: AzureKeyVault@1
30+
displayName: 'Azure Key Vault: Get Secrets'
31+
inputs:
32+
azureSubscription: 'vscode-builds-subscription'
33+
KeyVaultName: vscode
34+
35+
- script: |
36+
set -e
37+
cat << EOF > ~/.netrc
38+
machine github.com
39+
login vscode
40+
password $(github-distro-mixin-password)
41+
EOF
42+
43+
git config user.email "vscode@microsoft.com"
44+
git config user.name "VSCode"
45+
displayName: Prepare tooling
46+
47+
- script: |
48+
set -e
49+
git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
50+
git fetch distro
51+
git merge $(node -p "require('./package.json').distro")
52+
displayName: Merge distro
53+
54+
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
55+
inputs:
56+
keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
57+
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
58+
vstsFeed: 'npm-vscode'
59+
60+
- script: |
61+
set -e
62+
CHILD_CONCURRENCY=1 yarn --frozen-lockfile
63+
displayName: Install dependencies
64+
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
65+
66+
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
67+
inputs:
68+
keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
69+
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
70+
vstsFeed: 'npm-vscode'
71+
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
72+
73+
- script: |
74+
set -e
75+
yarn postinstall
76+
displayName: Run postinstall scripts
77+
condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
78+
79+
- script: |
80+
set -e
81+
node build/azure-pipelines/mixin
82+
displayName: Mix in quality
83+
84+
- script: |
85+
set -e
86+
VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
87+
yarn gulp vscode-web-min-ci
88+
displayName: Build
89+
90+
- script: |
91+
set -e
92+
AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
93+
AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
94+
VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
95+
./build/azure-pipelines/web/publish.sh
96+
displayName: Publish

‎build/azure-pipelines/web/publish.sh‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/usr/bin/env bash
2+
set -e
3+
REPO="$(pwd)"
4+
ROOT="$REPO/.."
5+
6+
# Publish Web Client
7+
WEB_BUILD_NAME="vscode-web"
8+
WEB_TARBALL_FILENAME="vscode-web.tar.gz"
9+
WEB_TARBALL_PATH="$ROOT/$WEB_TARBALL_FILENAME"
10+
11+
rm -rf $ROOT/vscode-web.tar.*
12+
13+
(cd $ROOT && tar --owner=0 --group=0 -czf $WEB_TARBALL_PATH $WEB_BUILD_NAME)
14+
15+
node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "web-standalone" archive-unsigned "$WEB_TARBALL_FILENAME" "$VERSION" true "$WEB_TARBALL_PATH"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ steps:
77
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
88
inputs:
99
keyfile: '.build/commit'
10-
targetfolder: '.build, **/out-build, **/out-vscode-min, **/out-vscode-reh-min, **/out-vscode-web-min'
10+
targetfolder: '.build, **/out-build, **/out-vscode-min, **/out-vscode-reh-min, **/out-vscode-reh-web-min'
1111
vstsFeed: 'npm-vscode'
1212
platformIndependent: true
1313
alias: 'Compilation'
@@ -98,7 +98,7 @@ steps:
9898
$env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
9999
exec { yarn gulp "vscode-win32-$env:VSCODE_ARCH-min-ci" }
100100
exec { yarn gulp "vscode-reh-win32-$env:VSCODE_ARCH-min-ci" }
101-
exec { yarn gulp "vscode-web-win32-$env:VSCODE_ARCH-min-ci" }
101+
exec { yarn gulp "vscode-reh-web-win32-$env:VSCODE_ARCH-min-ci" }
102102
exec { yarn gulp "vscode-win32-$env:VSCODE_ARCH-inno-updater" }
103103
displayName: Build
104104

‎build/gulpfile.reh.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ gulp.task('vscode-reh-linux-x64-min', noop);
4343
gulp.task('vscode-reh-linux-armhf-min', noop);
4444
gulp.task('vscode-reh-linux-alpine-min', noop);
4545

46-
gulp.task('vscode-web-win32-ia32-min', noop);
47-
gulp.task('vscode-web-win32-x64-min', noop);
48-
gulp.task('vscode-web-darwin-min', noop);
49-
gulp.task('vscode-web-linux-x64-min', noop);
50-
gulp.task('vscode-web-linux-alpine-min', noop);
46+
gulp.task('vscode-reh-web-win32-ia32-min', noop);
47+
gulp.task('vscode-reh-web-win32-x64-min', noop);
48+
gulp.task('vscode-reh-web-darwin-min', noop);
49+
gulp.task('vscode-reh-web-linux-x64-min', noop);
50+
gulp.task('vscode-reh-web-linux-alpine-min', noop);
5151

5252
function getNodeVersion() {
5353
const yarnrc = fs.readFileSync(path.join(REPO_ROOT, 'remote', '.yarnrc'), 'utf8');

0 commit comments

Comments
 (0)