Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/microsoft/vscode.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorRobo <hop2deep@gmail.com>2022-02-24 19:49:49 +0300
committerGitHub <noreply@github.com>2022-02-24 19:49:49 +0300
commitdf645f14506142d6b20be6f6bda6bc40286ff739 (patch)
treefa7b40c322e0a258df2f5314413990061e542b4a /build
parente6cfe7e81b73ae116312c6f4a38f0db314203284 (diff)
chore: revert to electron@13 (#143851)
* Revert "chore: update to electron 16 (#137241)" This reverts commit 01df559c184549248fcfbcecc5a616462e00c252. This reverts commit 46301339b71e7f99187edd262b809e8788bcb358 * ci: fix remote compiler for sdl-scan * chore: fix remote/.yarnrc * chore: fix build/npm/postinstall.js * chore: rm crash reporter from shared process * chore: rm crash reporter from ext host * chore: fix build/lib/layersChecker.ts * :chore: preserve some more changes * fix tests Co-authored-by: Benjamin Pasero <benjamin.pasero@microsoft.com>
Diffstat (limited to 'build')
-rw-r--r--build/.cachesalt2
-rw-r--r--build/azure-pipelines/darwin/product-build-darwin-sign.yml2
-rw-r--r--build/azure-pipelines/darwin/product-build-darwin.yml2
-rw-r--r--build/azure-pipelines/distro-build.yml2
-rw-r--r--build/azure-pipelines/exploration-build.yml2
-rw-r--r--build/azure-pipelines/linux/product-build-alpine.yml2
-rw-r--r--build/azure-pipelines/linux/product-build-linux-client.yml12
-rw-r--r--build/azure-pipelines/linux/product-build-linux-server.yml2
-rw-r--r--build/azure-pipelines/linux/snap-build-linux.yml2
-rw-r--r--build/azure-pipelines/product-compile.yml2
-rw-r--r--build/azure-pipelines/product-release.yml2
-rw-r--r--build/azure-pipelines/publish-types/publish-types.yml2
-rw-r--r--build/azure-pipelines/sdl-scan.yml15
-rw-r--r--build/azure-pipelines/web/product-build-web.yml2
-rw-r--r--build/azure-pipelines/win32/product-build-win32.yml2
-rw-r--r--build/lib/layersChecker.js18
-rw-r--r--build/lib/layersChecker.ts18
-rw-r--r--build/npm/postinstall.js1
-rw-r--r--build/package.json2
-rw-r--r--build/yarn.lock8
20 files changed, 30 insertions, 70 deletions
diff --git a/build/.cachesalt b/build/.cachesalt
index b9b30784ae3..3dc52e7d59a 100644
--- a/build/.cachesalt
+++ b/build/.cachesalt
@@ -1 +1 @@
-2022-02-10T01:18:08.504Z
+2022-02-24T13:55:48.169Z
diff --git a/build/azure-pipelines/darwin/product-build-darwin-sign.yml b/build/azure-pipelines/darwin/product-build-darwin-sign.yml
index e67678d9335..7d28236e2bf 100644
--- a/build/azure-pipelines/darwin/product-build-darwin-sign.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin-sign.yml
@@ -1,7 +1,7 @@
steps:
- task: NodeTool@0
inputs:
- versionSpec: "16.x"
+ versionSpec: "14.x"
- task: AzureKeyVault@1
displayName: "Azure Key Vault: Get Secrets"
diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml
index e0d4c43d8e3..375da9de1b7 100644
--- a/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -1,7 +1,7 @@
steps:
- task: NodeTool@0
inputs:
- versionSpec: "16.x"
+ versionSpec: "14.x"
- task: AzureKeyVault@1
displayName: "Azure Key Vault: Get Secrets"
diff --git a/build/azure-pipelines/distro-build.yml b/build/azure-pipelines/distro-build.yml
index 307f226dc0a..53b62b47a4e 100644
--- a/build/azure-pipelines/distro-build.yml
+++ b/build/azure-pipelines/distro-build.yml
@@ -11,7 +11,7 @@ pr:
steps:
- task: NodeTool@0
inputs:
- versionSpec: "16.x"
+ versionSpec: "14.x"
- task: AzureKeyVault@1
displayName: "Azure Key Vault: Get Secrets"
diff --git a/build/azure-pipelines/exploration-build.yml b/build/azure-pipelines/exploration-build.yml
index a80650bb92d..5b6599d8dab 100644
--- a/build/azure-pipelines/exploration-build.yml
+++ b/build/azure-pipelines/exploration-build.yml
@@ -7,7 +7,7 @@ pr: none
steps:
- task: NodeTool@0
inputs:
- versionSpec: "16.x"
+ versionSpec: "14.x"
- task: AzureKeyVault@1
displayName: "Azure Key Vault: Get Secrets"
diff --git a/build/azure-pipelines/linux/product-build-alpine.yml b/build/azure-pipelines/linux/product-build-alpine.yml
index d2563b82f68..e425e670cd3 100644
--- a/build/azure-pipelines/linux/product-build-alpine.yml
+++ b/build/azure-pipelines/linux/product-build-alpine.yml
@@ -1,7 +1,7 @@
steps:
- task: NodeTool@0
inputs:
- versionSpec: "16.x"
+ versionSpec: "14.x"
- task: AzureKeyVault@1
displayName: "Azure Key Vault: Get Secrets"
diff --git a/build/azure-pipelines/linux/product-build-linux-client.yml b/build/azure-pipelines/linux/product-build-linux-client.yml
index 30b5dce8d75..8b4b20a50ea 100644
--- a/build/azure-pipelines/linux/product-build-linux-client.yml
+++ b/build/azure-pipelines/linux/product-build-linux-client.yml
@@ -1,7 +1,7 @@
steps:
- task: NodeTool@0
inputs:
- versionSpec: "16.x"
+ versionSpec: "14.x"
- task: AzureKeyVault@1
displayName: "Azure Key Vault: Get Secrets"
@@ -99,7 +99,7 @@ steps:
if [ -z "$CC" ] || [ -z "$CXX" ]; then
# Download clang based on chromium revision used by vscode
- curl -s https://raw.githubusercontent.com/chromium/chromium/96.0.4664.110/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux
+ curl -s https://raw.githubusercontent.com/chromium/chromium/91.0.4472.164/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux
# Download libcxx headers and objects from upstream electron releases
DEBUG=libcxx-fetcher \
VSCODE_LIBCXX_OBJECTS_DIR=$PWD/.build/libcxx-objects \
@@ -109,12 +109,12 @@ steps:
node build/linux/libcxx-fetcher.js
# Set compiler toolchain
# Flags for the client build are based on
- # https://source.chromium.org/chromium/chromium/src/+/refs/tags/96.0.4664.110:build/config/arm.gni
- # https://source.chromium.org/chromium/chromium/src/+/refs/tags/96.0.4664.110:build/config/compiler/BUILD.gn
- # https://source.chromium.org/chromium/chromium/src/+/refs/tags/96.0.4664.110:build/config/c++/BUILD.gn
+ # https://source.chromium.org/chromium/chromium/src/+/refs/tags/91.0.4472.164:build/config/arm.gni
+ # https://source.chromium.org/chromium/chromium/src/+/refs/tags/91.0.4472.164:build/config/compiler/BUILD.gn
+ # https://source.chromium.org/chromium/chromium/src/+/refs/tags/91.0.4472.164:build/config/c++/BUILD.gn
export CC=$PWD/.build/CR_Clang/bin/clang
export CXX=$PWD/.build/CR_Clang/bin/clang++
- export CXXFLAGS="-nostdinc++ -D__NO_INLINE__ -isystem$PWD/.build/libcxx_headers -isystem$PWD/.build/libcxx_headers/include -isystem$PWD/.build/libcxxabi_headers/include -fPIC -flto=thin -fsplit-lto-unit"
+ export CXXFLAGS="-nostdinc++ -D_LIBCPP_HAS_NO_VENDOR_AVAILABILITY_ANNOTATIONS -D__NO_INLINE__ -isystem$PWD/.build/libcxx_headers/include -isystem$PWD/.build/libcxxabi_headers/include -fPIC -flto=thin -fsplit-lto-unit"
export LDFLAGS="-stdlib=libc++ -fuse-ld=lld -flto=thin -L$PWD/.build/libcxx-objects -lc++abi -Wl,--lto-O0"
export VSCODE_REMOTE_CC=$(which gcc)
export VSCODE_REMOTE_CXX=$(which g++)
diff --git a/build/azure-pipelines/linux/product-build-linux-server.yml b/build/azure-pipelines/linux/product-build-linux-server.yml
index af04c89f603..cbda3510d62 100644
--- a/build/azure-pipelines/linux/product-build-linux-server.yml
+++ b/build/azure-pipelines/linux/product-build-linux-server.yml
@@ -1,7 +1,7 @@
steps:
- task: NodeTool@0
inputs:
- versionSpec: "16.x"
+ versionSpec: "14.x"
- task: AzureKeyVault@1
displayName: "Azure Key Vault: Get Secrets"
diff --git a/build/azure-pipelines/linux/snap-build-linux.yml b/build/azure-pipelines/linux/snap-build-linux.yml
index 12829334956..33a80b74391 100644
--- a/build/azure-pipelines/linux/snap-build-linux.yml
+++ b/build/azure-pipelines/linux/snap-build-linux.yml
@@ -1,7 +1,7 @@
steps:
- task: NodeTool@0
inputs:
- versionSpec: "16.x"
+ versionSpec: "14.x"
- task: DownloadPipelineArtifact@0
displayName: "Download Pipeline Artifact"
diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml
index b3cec3a3ab1..44364c76bec 100644
--- a/build/azure-pipelines/product-compile.yml
+++ b/build/azure-pipelines/product-compile.yml
@@ -1,7 +1,7 @@
steps:
- task: NodeTool@0
inputs:
- versionSpec: "16.x"
+ versionSpec: "14.x"
- task: AzureKeyVault@1
displayName: "Azure Key Vault: Get Secrets"
diff --git a/build/azure-pipelines/product-release.yml b/build/azure-pipelines/product-release.yml
index a1086945595..fa6396b1486 100644
--- a/build/azure-pipelines/product-release.yml
+++ b/build/azure-pipelines/product-release.yml
@@ -1,7 +1,7 @@
steps:
- task: NodeTool@0
inputs:
- versionSpec: "16.x"
+ versionSpec: "14.x"
- task: AzureCLI@2
inputs:
diff --git a/build/azure-pipelines/publish-types/publish-types.yml b/build/azure-pipelines/publish-types/publish-types.yml
index 031fafd4c75..043bb5141ba 100644
--- a/build/azure-pipelines/publish-types/publish-types.yml
+++ b/build/azure-pipelines/publish-types/publish-types.yml
@@ -12,7 +12,7 @@ pool:
steps:
- task: NodeTool@0
inputs:
- versionSpec: "16.x"
+ versionSpec: "14.x"
- bash: |
TAG_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`)
diff --git a/build/azure-pipelines/sdl-scan.yml b/build/azure-pipelines/sdl-scan.yml
index c935a23afd5..0b4e16d4570 100644
--- a/build/azure-pipelines/sdl-scan.yml
+++ b/build/azure-pipelines/sdl-scan.yml
@@ -47,7 +47,7 @@ stages:
outputFormat: "pre"
- task: NodeTool@0
inputs:
- versionSpec: "16.x"
+ versionSpec: "14.x"
- task: AzureKeyVault@1
displayName: "Azure Key Vault: Get Secrets"
@@ -139,7 +139,7 @@ stages:
toolMajorVersion: "V2"
- task: NodeTool@0
inputs:
- versionSpec: "16.x"
+ versionSpec: "14.x"
- task: AzureKeyVault@1
displayName: "Azure Key Vault: Get Secrets"
@@ -191,7 +191,7 @@ stages:
if [ -z "$CC" ] || [ -z "$CXX" ]; then
# Download clang based on chromium revision used by vscode
- curl -s https://raw.githubusercontent.com/chromium/chromium/96.0.4664.110/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux
+ curl -s https://raw.githubusercontent.com/chromium/chromium/91.0.4472.164/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux
# Download libcxx headers and objects from upstream electron releases
DEBUG=libcxx-fetcher \
VSCODE_LIBCXX_OBJECTS_DIR=$PWD/.build/libcxx-objects \
@@ -202,13 +202,10 @@ stages:
# Set compiler toolchain
export CC=$PWD/.build/CR_Clang/bin/clang
export CXX=$PWD/.build/CR_Clang/bin/clang++
- export CXXFLAGS="-nostdinc++ -D__NO_INLINE__ -isystem$PWD/.build/libcxx_headers -isystem$PWD/.build/libcxx_headers/include -isystem$PWD/.build/libcxxabi_headers/include -fPIC -flto=thin -fsplit-lto-unit"
+ export CXXFLAGS="-nostdinc++ -D_LIBCPP_HAS_NO_VENDOR_AVAILABILITY_ANNOTATIONS -isystem$PWD/.build/libcxx_headers/include -isystem$PWD/.build/libcxxabi_headers/include -fPIC -flto=thin -fsplit-lto-unit"
export LDFLAGS="-stdlib=libc++ -fuse-ld=lld -flto=thin -fsplit-lto-unit -L$PWD/.build/libcxx-objects -lc++abi"
- fi
-
- if [ "$VSCODE_ARCH" == "x64" ]; then
- export VSCODE_REMOTE_CC=$(which gcc-4.9)
- export VSCODE_REMOTE_CXX=$(which g++-4.9)
+ export VSCODE_REMOTE_CC=$(which gcc)
+ export VSCODE_REMOTE_CXX=$(which g++)
fi
for i in {1..3}; do # try 3 times, for Terrapin
diff --git a/build/azure-pipelines/web/product-build-web.yml b/build/azure-pipelines/web/product-build-web.yml
index a33530fd4a5..aced8b3076f 100644
--- a/build/azure-pipelines/web/product-build-web.yml
+++ b/build/azure-pipelines/web/product-build-web.yml
@@ -1,7 +1,7 @@
steps:
- task: NodeTool@0
inputs:
- versionSpec: "16.x"
+ versionSpec: "14.x"
- task: AzureKeyVault@1
displayName: "Azure Key Vault: Get Secrets"
diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
index 344309018ae..49d2e4d7d56 100644
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@@ -1,7 +1,7 @@
steps:
- task: NodeTool@0
inputs:
- versionSpec: "16.x"
+ versionSpec: "14.x"
- task: UsePythonVersion@0
inputs:
diff --git a/build/lib/layersChecker.js b/build/lib/layersChecker.js
index 15129442279..658ccfc516c 100644
--- a/build/lib/layersChecker.js
+++ b/build/lib/layersChecker.js
@@ -53,21 +53,6 @@ const CORE_TYPES = [
'trimLeft',
'trimRight',
'queueMicrotask',
- 'Array',
- 'Uint8Array',
- 'Uint16Array',
- 'Uint32Array',
- 'Int8Array',
- 'Int16Array',
- 'Int32Array',
- 'Float32Array',
- 'Float64Array',
- 'Uint8ClampedArray',
- 'BigUint64Array',
- 'BigInt64Array',
- 'btoa',
- 'atob',
- 'AbortSignal',
'MessageChannel',
'MessagePort'
];
@@ -160,9 +145,6 @@ const RULES = [
target: '**/vs/**/browser/**',
allowedTypes: CORE_TYPES,
disallowedTypes: NATIVE_TYPES,
- allowedDefinitions: [
- '@types/node/stream/consumers.d.ts' // node.js started to duplicate types from lib.dom.d.ts so we have to account for that
- ],
disallowedDefinitions: [
'@types/node' // no node.js
]
diff --git a/build/lib/layersChecker.ts b/build/lib/layersChecker.ts
index a31873d2ac8..6a860200085 100644
--- a/build/lib/layersChecker.ts
+++ b/build/lib/layersChecker.ts
@@ -54,21 +54,6 @@ const CORE_TYPES = [
'trimLeft',
'trimRight',
'queueMicrotask',
- 'Array',
- 'Uint8Array',
- 'Uint16Array',
- 'Uint32Array',
- 'Int8Array',
- 'Int16Array',
- 'Int32Array',
- 'Float32Array',
- 'Float64Array',
- 'Uint8ClampedArray',
- 'BigUint64Array',
- 'BigInt64Array',
- 'btoa',
- 'atob',
- 'AbortSignal',
'MessageChannel',
'MessagePort'
];
@@ -173,9 +158,6 @@ const RULES = [
target: '**/vs/**/browser/**',
allowedTypes: CORE_TYPES,
disallowedTypes: NATIVE_TYPES,
- allowedDefinitions: [
- '@types/node/stream/consumers.d.ts' // node.js started to duplicate types from lib.dom.d.ts so we have to account for that
- ],
disallowedDefinitions: [
'@types/node' // no node.js
]
diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
index bf2181cf9f7..2433da29e86 100644
--- a/build/npm/postinstall.js
+++ b/build/npm/postinstall.js
@@ -62,7 +62,6 @@ for (let dir of dirs) {
if (process.env['VSCODE_REMOTE_CC']) { env['CC'] = process.env['VSCODE_REMOTE_CC']; }
if (process.env['VSCODE_REMOTE_CXX']) { env['CXX'] = process.env['VSCODE_REMOTE_CXX']; }
if (process.env['CXXFLAGS']) { delete env['CXXFLAGS']; }
- if (process.env['CFLAGS']) { delete env['CFLAGS']; }
if (process.env['LDFLAGS']) { delete env['LDFLAGS']; }
if (process.env['VSCODE_REMOTE_NODE_GYP']) { env['npm_config_node_gyp'] = process.env['VSCODE_REMOTE_NODE_GYP']; }
opts = { env };
diff --git a/build/package.json b/build/package.json
index eb85be5acaf..456b7e87ed5 100644
--- a/build/package.json
+++ b/build/package.json
@@ -29,7 +29,7 @@
"@types/minimist": "^1.2.1",
"@types/mkdirp": "^1.0.1",
"@types/mocha": "^8.2.0",
- "@types/node": "16.x",
+ "@types/node": "14.x",
"@types/p-limit": "^2.2.0",
"@types/plist": "^3.0.2",
"@types/pump": "^1.0.1",
diff --git a/build/yarn.lock b/build/yarn.lock
index 925ed369f62..13d05a4352c 100644
--- a/build/yarn.lock
+++ b/build/yarn.lock
@@ -507,10 +507,10 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.51.tgz#b31d716fb8d58eeb95c068a039b9b6292817d5fb"
integrity sha512-El3+WJk2D/ppWNd2X05aiP5l2k4EwF7KwheknQZls+I26eSICoWRhRIJ56jGgw2dqNGQ5LtNajmBU2ajS28EvQ==
-"@types/node@16.x":
- version "16.11.6"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae"
- integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==
+"@types/node@14.x":
+ version "14.14.43"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.43.tgz#26bcbb0595b305400e8ceaf9a127a7f905ae49c8"
+ integrity sha512-3pwDJjp1PWacPTpH0LcfhgjvurQvrZFBrC6xxjaUEZ7ifUtT32jtjPxEMMblpqd2Mvx+k8haqQJLQxolyGN/cQ==
"@types/p-limit@^2.2.0":
version "2.2.0"