Skip to content

Commit 3de7cd2

Browse files
committed
chore: revert to electron@13
1 parent 8be6345 commit 3de7cd2

File tree

92 files changed

+318
-370
lines changed

Some content is hidden

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

92 files changed

+318
-370
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: 16
26+
node-version: 14
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: 16
116+
node-version: 14
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 }}-cacheNodeModules19-${{ steps.nodeModulesCacheKey.outputs.value }}
127-
restore-keys: ${{ runner.os }}-cacheNodeModules19-
126+
key: ${{ runner.os }}-cacheNodeModules20-${{ steps.nodeModulesCacheKey.outputs.value }}
127+
restore-keys: ${{ runner.os }}-cacheNodeModules20-
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: 16
188+
node-version: 14
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 }}-cacheNodeModules19-${{ steps.nodeModulesCacheKey.outputs.value }}
199-
restore-keys: ${{ runner.os }}-cacheNodeModules19-
198+
key: ${{ runner.os }}-cacheNodeModules20-${{ steps.nodeModulesCacheKey.outputs.value }}
199+
restore-keys: ${{ runner.os }}-cacheNodeModules20-
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: 16
262+
node-version: 14
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 }}-cacheNodeModules19-${{ steps.nodeModulesCacheKey.outputs.value }}
273-
restore-keys: ${{ runner.os }}-cacheNodeModules19-
272+
key: ${{ runner.os }}-cacheNodeModules20-${{ steps.nodeModulesCacheKey.outputs.value }}
273+
restore-keys: ${{ runner.os }}-cacheNodeModules20-
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: 16
27+
node-version: 14
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 "16.0.9"
2+
target "13.5.2"
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-
2022-02-10T01:18:08.504Z
1+
2022-02-24T03:14:09.359Z

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: "16.x"
4+
versionSpec: "14.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: "16.x"
4+
versionSpec: "14.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: "16.x"
14+
versionSpec: "14.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: "16.x"
10+
versionSpec: "14.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: "16.x"
4+
versionSpec: "14.x"
55

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

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

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

66
- task: AzureKeyVault@1
77
displayName: "Azure Key Vault: Get Secrets"
@@ -99,7 +99,7 @@ steps:
9999
100100
if [ -z "$CC" ] || [ -z "$CXX" ]; then
101101
# Download clang based on chromium revision used by vscode
102-
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
102+
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
103103
# Download libcxx headers and objects from upstream electron releases
104104
DEBUG=libcxx-fetcher \
105105
VSCODE_LIBCXX_OBJECTS_DIR=$PWD/.build/libcxx-objects \
@@ -109,12 +109,12 @@ steps:
109109
node build/linux/libcxx-fetcher.js
110110
# Set compiler toolchain
111111
# Flags for the client build are based on
112-
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/96.0.4664.110:build/config/arm.gni
113-
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/96.0.4664.110:build/config/compiler/BUILD.gn
114-
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/96.0.4664.110:build/config/c++/BUILD.gn
112+
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/91.0.4472.164:build/config/arm.gni
113+
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/91.0.4472.164:build/config/compiler/BUILD.gn
114+
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/91.0.4472.164:build/config/c++/BUILD.gn
115115
export CC=$PWD/.build/CR_Clang/bin/clang
116116
export CXX=$PWD/.build/CR_Clang/bin/clang++
117-
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"
117+
export CXXFLAGS="-nostdinc++ -D_LIBCPP_HAS_NO_VENDOR_AVAILABILITY_ANNOTATIONS -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"
118118
export LDFLAGS="-stdlib=libc++ -fuse-ld=lld -flto=thin -L$PWD/.build/libcxx-objects -lc++abi -Wl,--lto-O0"
119119
export VSCODE_REMOTE_CC=$(which gcc)
120120
export VSCODE_REMOTE_CXX=$(which g++)

0 commit comments

Comments
 (0)