Skip to content

Commit a5193a4

Browse files
TyriarTyriar
authored
Merge branch 'main' into tyriar/181834
2 parents b7ec246 + bfe6dcb commit a5193a4

File tree

99 files changed

+2225
-1077
lines changed

Some content is hidden

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

99 files changed

+2225
-1077
lines changed

‎build/.cachesalt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2023-03-31T12:39:03.753Z
1+
2023-06-12T12:55:48.130Z

‎build/.moduleignore.darwin

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
@vscode/windows-mutex/index.js
2+
@vscode/windows-mutex/**/*.node
3+
@vscode/windows-mutex/*.md
4+
@vscode/windows-mutex/package.json
5+
6+
@vscode/windows-registry/dist/**
7+
@vscode/windows-registry/**/*.node
8+
@vscode/windows-registry/*.md
9+
@vscode/windows-registry/*.txt
10+
@vscode/windows-registry/package.json
11+
!@vscode/windows-registry/dist/index.d.ts

‎build/.moduleignore.linux

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
@vscode/windows-mutex/index.js
2+
@vscode/windows-mutex/**/*.node
3+
@vscode/windows-mutex/*.md
4+
@vscode/windows-mutex/package.json
5+
6+
@vscode/windows-registry/dist/**
7+
@vscode/windows-registry/**/*.node
8+
@vscode/windows-registry/*.md
9+
@vscode/windows-registry/*.txt
10+
@vscode/windows-registry/package.json
11+
!@vscode/windows-registry/dist/index.d.ts

‎build/.moduleignore.win32

Whitespace-only changes.

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,10 @@ steps:
8686
# TODO@joaomoreno TODO@deepak1556 this should be part of the base image
8787
- ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
8888
- script: |
89-
if [ "$VSCODE_ARCH" = "x64" ]; then
90-
OS=ubuntu
91-
else
92-
OS=debian
93-
fi
94-
9589
sudo apt-get update && sudo apt-get install -y ca-certificates curl gnupg
9690
sudo mkdir -m 0755 -p /etc/apt/keyrings
97-
curl -fsSL https://download.docker.com/linux/$OS/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
98-
echo "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/$OS "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
91+
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
92+
echo "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
9993
sudo apt update && sudo apt install -y docker-ce-cli
10094
displayName: Install Docker client
10195
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,11 @@ resources:
144144
endpoint: VSCodeHub
145145
options: --user 0:0 --cap-add SYS_ADMIN
146146
- container: vscode-arm64
147-
image: vscodehub.azurecr.io/vscode-linux-build-agent:buster-arm64
147+
image: vscodehub.azurecr.io/vscode-linux-build-agent:bionic-arm64
148148
endpoint: VSCodeHub
149149
options: --user 0:0 --cap-add SYS_ADMIN
150150
- container: vscode-armhf
151-
image: vscodehub.azurecr.io/vscode-linux-build-agent:buster-armhf
151+
image: vscodehub.azurecr.io/vscode-linux-build-agent:bionic-armhf
152152
endpoint: VSCodeHub
153153
options: --user 0:0 --cap-add SYS_ADMIN
154154
- container: snapcraft

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

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ function main(): Promise<void> {
3939
const productionDependencies: { name: string; path: string; version: string }[] = deps.getProductionDependencies(root);
4040
const productionDependenciesSrc = productionDependencies.map(d => path.relative(root, d.path)).map(d => `./${d}/**/*.map`);
4141
const nodeModules = vfs.src(productionDependenciesSrc, { base: '.' })
42-
.pipe(util.cleanNodeModules(path.join(root, 'build', '.moduleignore')));
42+
.pipe(util.cleanNodeModules(path.join(root, 'build', '.moduleignore')))
43+
.pipe(util.cleanNodeModules(path.join(root, 'build', `.moduleignore.${process.platform}`)));
4344
sources.push(nodeModules);
4445

4546
const extensionsOut = vfs.src(['.build/extensions/**/*.js.map', '!**/node_modules/**'], { base: '.build' });

‎build/gulpfile.reh.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
269269
// filter out unnecessary files, no source maps in server build
270270
.pipe(filter(['**', '!**/package-lock.json', '!**/yarn.lock', '!**/*.js.map']))
271271
.pipe(util.cleanNodeModules(path.join(__dirname, '.moduleignore')))
272+
.pipe(util.cleanNodeModules(path.join(__dirname, `.moduleignore.${process.platform}`)))
272273
.pipe(jsFilter)
273274
.pipe(util.stripSourceMappingURL())
274275
.pipe(jsFilter.restore);

‎build/gulpfile.vscode.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
276276
const deps = gulp.src(dependenciesSrc, { base: '.', dot: true })
277277
.pipe(filter(['**', `!**/${config.version}/**`, '!**/bin/darwin-arm64-87/**', '!**/package-lock.json', '!**/yarn.lock', '!**/*.js.map']))
278278
.pipe(util.cleanNodeModules(path.join(__dirname, '.moduleignore')))
279+
.pipe(util.cleanNodeModules(path.join(__dirname, `.moduleignore.${process.platform}`)))
279280
.pipe(jsFilter)
280281
.pipe(util.rewriteSourceMappingURL(sourceMappingURLBase))
281282
.pipe(jsFilter.restore)

0 commit comments

Comments
 (0)