Skip to content

Commit 1648e1d

Browse files
author
Benjamin Pasero
committed
web - add build
1 parent 2443cf5 commit 1648e1d

19 files changed

Lines changed: 231 additions & 28 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
AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
9494
yarn gulp upload-vscode-sourcemaps
9595
displayName: Build

‎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'
@@ -90,7 +90,7 @@ steps:
9090
VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
9191
yarn gulp vscode-reh-linux-$VSCODE_ARCH-min-ci
9292
VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
93-
yarn gulp vscode-web-linux-$VSCODE_ARCH-min-ci
93+
yarn gulp vscode-reh-web-linux-$VSCODE_ARCH-min-ci
9494
displayName: Build
9595

9696
- script: |

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,18 @@ jobs:
8989
steps:
9090
- template: linux/product-build-linux-multiarch.yml
9191

92+
- job: LinuxWeb
93+
condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_WEB'], 'true'))
94+
timeoutInMinutes: 120
95+
pool:
96+
vmImage: 'Ubuntu-16.04'
97+
variables:
98+
VSCODE_ARCH: x64
99+
dependsOn:
100+
- Compile
101+
steps:
102+
- template: web/product-build-web.yml
103+
92104
- job: macOS
93105
condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_MACOS'], 'true'))
94106
timeoutInMinutes: 120

‎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'
@@ -105,14 +105,14 @@ steps:
105105
yarn gulp compile-extensions-build
106106
yarn gulp minify-vscode
107107
yarn gulp minify-vscode-reh
108-
yarn gulp minify-vscode-web
108+
yarn gulp minify-vscode-reh-web
109109
displayName: Compile
110110
condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
111111

112112
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
113113
inputs:
114114
keyfile: '.build/commit'
115-
targetfolder: '.build, **/out-build, **/out-vscode-min, **/out-vscode-reh-min, **/out-vscode-web-min'
115+
targetfolder: '.build, **/out-build, **/out-vscode-min, **/out-vscode-reh-min, **/out-vscode-reh-web-min'
116116
vstsFeed: 'npm-vscode'
117117
platformIndependent: true
118118
alias: 'Compilation'

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

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