Skip to content

Commit 01df559

Browse files
deepak1556bpaserorzhao271
authored
chore: update to electron 16 (microsoft#137241)
* chore: bump electron@15.3.0 * chore: bump node@16.x * chore: enable render process reuse * Revert "watcher - use `type` property for crash reporter location" This reverts commit bfa488d. * Revert "watcher - enable crash reports on linux (microsoft#136264)" This reverts commit af26148. * chore: enable crashpad on linux * chore: bump electron@15.3.1 * chore: update api changes * chore: bump @vscode/sqlite3@5.0.3 * spec: skip non-context aware module unittests * chore: fix perf hook integration with node environment * fix: adopt fs api changes * chore: fix integration tests * chore: bump electron@15.3.2 * chore: bump electron@16.0.0 * temp(macOS): kill test instances in OSS * Revert "temp(macOS): kill test instances in OSS" This reverts commit b0d796c. * chore: update chromium version for clang downloader * some 💄 changes * align with changes * adopt more fs.rm * 💄 * chore: bump @vscode/sqlite3@5.0.4 * fix layers check to account for duplicated types from node.js * update todo for type casts * smoke - fix compile issue * chore: update module cache * watcher - fix unhandled rejection (fix microsoft#137416) * ci: update node version * enable stack dumping * update electron types to 16.x * chore: bump @vscode/sqlite3@5.0.5 Refs microsoft#137496 * fix layer issue * add `AbortSignal` to core types * chore: update linux compile flags Refs electron/electron@797723e * ci: fix linux build * ci: update github ci cache * ci: fix remote build in github ci * ci: better fix for remote build * chore: bump azure cache * chore: fix merge conflict * :chore: update to electron@16.0.2 * chore: bump @vscode/sqlite3@5.0.7 * ci: update to gcc-4.9 for remote Refs microsoft#137659 * ci: switch to buster for linux arm Refs microsoft#137927 * ci: fix build on linux arm64 * ci: fix arm client compiler toolchain Refs microsoft#137927 * chore: bump electron@16.0.3 * ci: fix compile flags for the c toolchain * chore: bump electron@16.0.4 * Add experimental dark mode flag (microsoft#139109) * Add experimental dark mode flag * Apply PR feedback * chore: bump electron@16.0.6 * chore: bump electron@16.0.7 Fixes microsoft#138792 Fixes microsoft#139300 * chore: experimental highlight API * smoke - fix compile issue * FIXME: custom ELECTRON_RUN_AS_NODE with node worker * Revert "chore: bump electron@16.0.7" This reverts commit 5fd01cf. * Revert "Revert "chore: bump electron@16.0.7"" This reverts commit a7f1b73. * chore: fix github linux workflow * chore: address review feedback * chore: bump electron@16.0.8 * ci: revert to stretch distro for linux arm Refs microsoft#137927 * ci: force build * chore: update yarn.lock * address feedback * Revert "FIXME: custom ELECTRON_RUN_AS_NODE with node worker" This reverts commit 7b48fa3. * ci: fix remote folder build * chore: fix github linux ci * 🆙 `versionSpec` Co-authored-by: Benjamin Pasero <benjamin.pasero@microsoft.com> Co-authored-by: Raymond Zhao <raymondzhao@microsoft.com>
1 parent 47b5413 commit 01df559

File tree

121 files changed

+473
-539
lines changed

Some content is hidden

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

121 files changed

+473
-539
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- uses: actions/setup-node@v2
2525
with:
26-
node-version: 14
26+
node-version: 16
2727

2828
- uses: actions/setup-python@v2
2929
with:
@@ -113,7 +113,7 @@ jobs:
113113
114114
- uses: actions/setup-node@v2
115115
with:
116-
node-version: 14
116+
node-version: 16
117117

118118
- name: Compute node modules cache key
119119
id: nodeModulesCacheKey
@@ -123,8 +123,8 @@ jobs:
123123
uses: actions/cache@v2
124124
with:
125125
path: "**/node_modules"
126-
key: ${{ runner.os }}-cacheNodeModules14-${{ steps.nodeModulesCacheKey.outputs.value }}
127-
restore-keys: ${{ runner.os }}-cacheNodeModules14-
126+
key: ${{ runner.os }}-cacheNodeModules19-${{ steps.nodeModulesCacheKey.outputs.value }}
127+
restore-keys: ${{ runner.os }}-cacheNodeModules19-
128128
- name: Get yarn cache directory path
129129
id: yarnCacheDirPath
130130
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
@@ -185,7 +185,7 @@ jobs:
185185

186186
- uses: actions/setup-node@v2
187187
with:
188-
node-version: 14
188+
node-version: 16
189189

190190
- name: Compute node modules cache key
191191
id: nodeModulesCacheKey
@@ -195,8 +195,8 @@ jobs:
195195
uses: actions/cache@v2
196196
with:
197197
path: "**/node_modules"
198-
key: ${{ runner.os }}-cacheNodeModules14-${{ steps.nodeModulesCacheKey.outputs.value }}
199-
restore-keys: ${{ runner.os }}-cacheNodeModules14-
198+
key: ${{ runner.os }}-cacheNodeModules19-${{ steps.nodeModulesCacheKey.outputs.value }}
199+
restore-keys: ${{ runner.os }}-cacheNodeModules19-
200200
- name: Get yarn cache directory path
201201
id: yarnCacheDirPath
202202
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
@@ -259,7 +259,7 @@ jobs:
259259

260260
- uses: actions/setup-node@v2
261261
with:
262-
node-version: 14
262+
node-version: 16
263263

264264
- name: Compute node modules cache key
265265
id: nodeModulesCacheKey
@@ -269,8 +269,8 @@ jobs:
269269
uses: actions/cache@v2
270270
with:
271271
path: "**/node_modules"
272-
key: ${{ runner.os }}-cacheNodeModules14-${{ steps.nodeModulesCacheKey.outputs.value }}
273-
restore-keys: ${{ runner.os }}-cacheNodeModules14-
272+
key: ${{ runner.os }}-cacheNodeModules19-${{ steps.nodeModulesCacheKey.outputs.value }}
273+
restore-keys: ${{ runner.os }}-cacheNodeModules19-
274274
- name: Get yarn cache directory path
275275
id: yarnCacheDirPath
276276
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}

.github/workflows/rich-navigation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
- uses: actions/setup-node@v2
2626
with:
27-
node-version: 14
27+
node-version: 16
2828

2929
- name: Install dependencies
3030
if: steps.caching-stage.outputs.cache-hit != 'true'

.yarnrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
disturl "https://electronjs.org/headers"
2-
target "13.5.2"
2+
target "16.0.8"
33
runtime "electron"
44
build_from_source "true"

build/.cachesalt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2021-11-24T12:04:58.681Z
1+
2022-02-03T12:38:01.545Z

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
steps:
22
- task: NodeTool@0
33
inputs:
4-
versionSpec: "14.x"
4+
versionSpec: "16.x"
55

66
- task: AzureKeyVault@1
77
displayName: "Azure Key Vault: Get Secrets"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
steps:
22
- task: NodeTool@0
33
inputs:
4-
versionSpec: "14.x"
4+
versionSpec: "16.x"
55

66
- task: AzureKeyVault@1
77
displayName: "Azure Key Vault: Get Secrets"

build/azure-pipelines/distro-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pr:
1111
steps:
1212
- task: NodeTool@0
1313
inputs:
14-
versionSpec: "14.x"
14+
versionSpec: "16.x"
1515

1616
- task: AzureKeyVault@1
1717
displayName: "Azure Key Vault: Get Secrets"

build/azure-pipelines/exploration-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pr: none
77
steps:
88
- task: NodeTool@0
99
inputs:
10-
versionSpec: "14.x"
10+
versionSpec: "16.x"
1111

1212
- task: AzureKeyVault@1
1313
displayName: "Azure Key Vault: Get Secrets"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
steps:
22
- task: NodeTool@0
33
inputs:
4-
versionSpec: "14.x"
4+
versionSpec: "16.x"
55

66
- task: AzureKeyVault@1
77
displayName: "Azure Key Vault: Get Secrets"

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

Lines changed: 35 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
steps:
22
- task: NodeTool@0
33
inputs:
4-
versionSpec: "14.x"
4+
versionSpec: "16.x"
55

66
- task: AzureKeyVault@1
77
displayName: "Azure Key Vault: Get Secrets"
@@ -87,21 +87,40 @@ steps:
8787
set -e
8888
export npm_config_arch=$(NPM_ARCH)
8989
90-
if [ -z "$CC" ] || [ -z "$CXX" ]; then
91-
# Download clang based on chromium revision used by vscode
92-
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
93-
# Download libcxx headers and objects from upstream electron releases
94-
DEBUG=libcxx-fetcher \
95-
VSCODE_LIBCXX_OBJECTS_DIR=$PWD/.build/libcxx-objects \
96-
VSCODE_LIBCXX_HEADERS_DIR=$PWD/.build/libcxx_headers \
97-
VSCODE_LIBCXXABI_HEADERS_DIR=$PWD/.build/libcxxabi_headers \
98-
VSCODE_ARCH="$(NPM_ARCH)" \
99-
node build/linux/libcxx-fetcher.js
100-
# Set compiler toolchain
101-
export CC=$PWD/.build/CR_Clang/bin/clang
102-
export CXX=$PWD/.build/CR_Clang/bin/clang++
103-
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"
104-
export LDFLAGS="-stdlib=libc++ -fuse-ld=lld -flto=thin -fsplit-lto-unit -L$PWD/.build/libcxx-objects -lc++abi"
90+
# Download clang based on chromium revision used by vscode
91+
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
92+
# Download libcxx headers and objects from upstream electron releases
93+
DEBUG=libcxx-fetcher \
94+
VSCODE_LIBCXX_OBJECTS_DIR=$PWD/.build/libcxx-objects \
95+
VSCODE_LIBCXX_HEADERS_DIR=$PWD/.build/libcxx_headers \
96+
VSCODE_LIBCXXABI_HEADERS_DIR=$PWD/.build/libcxxabi_headers \
97+
VSCODE_ARCH="$(NPM_ARCH)" \
98+
node build/linux/libcxx-fetcher.js
99+
# Set compiler toolchain
100+
# Flags for the client build are based on
101+
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/96.0.4664.110:build/config/arm.gni
102+
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/96.0.4664.110:build/config/compiler/BUILD.gn
103+
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/96.0.4664.110:build/config/c++/BUILD.gn
104+
export CC=$PWD/.build/CR_Clang/bin/clang
105+
export CXX=$PWD/.build/CR_Clang/bin/clang++
106+
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"
107+
export CFLAGS="-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"
108+
export LDFLAGS="-stdlib=libc++ -fuse-ld=lld -flto=thin -fsplit-lto-unit -L$PWD/.build/libcxx-objects -lc++abi"
109+
110+
if [ "$VSCODE_ARCH" == "arm64" ]; then
111+
export CXXFLAGS="${CXXFLAGS} --target=aarch64-linux-gnu -fwhole-program-vtables"
112+
export CFLAGS="${CFLAGS} --target=aarch64-linux-gnu -fwhole-program-vtables"
113+
export LDFLAGS="${LDFLAGS} --target=aarch64-linux-gnu -march=arm64 -fwhole-program-vtables"
114+
export VSCODE_REMOTE_CC=/usr/bin/aarch64-linux-gnu-gcc
115+
export VSCODE_REMOTE_CXX=/usr/bin/aarch64-linux-gnu-g++
116+
fi
117+
118+
if [ "$VSCODE_ARCH" == "armhf" ]; then
119+
export CXXFLAGS="${CXXFLAGS} --target=arm-linux-gnueabihf -march=armv7-a -mthumb -mfloat-abi=hard -mfpu=neon -mtune=generic-armv7-a"
120+
export CFLAGS="${CFLAGS} --target=arm-linux-gnueabihf -march=armv7-a -mthumb -mfloat-abi=hard -mfpu=neon -mtune=generic-armv7-a"
121+
export LDFLAGS="${LDFLAGS} --target=arm-linux-gnueabihf -march=armv7-a"
122+
export VSCODE_REMOTE_CC=/usr/bin/arm-linux-gnueabihf-gcc
123+
export VSCODE_REMOTE_CXX=/usr/bin/arm-linux-gnueabihf-g++
105124
fi
106125
107126
for i in {1..3}; do # try 3 times, for Terrapin

0 commit comments

Comments
 (0)