Skip to content

Commit 9d7c34c

Browse files
deepak1556deepak1556
authored
chore: update [email protected] (#263552)
* chore: update [email protected] (#262877) * chore: update [email protected] * chore: remove workaround for npm scripts argument parsing Refs nodejs/node@f99aa74 * chore: update [email protected] * temp: bump distro * chore: bump distro
1 parent f492c3d commit 9d7c34c

File tree

14 files changed

+117
-125
lines changed

14 files changed

+117
-125
lines changed

‎.github/workflows/pr-win32-test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ jobs:
121121
run: |
122122
for ($i = 1; $i -le 3; $i++) {
123123
try {
124-
npm exec -- -- npm-run-all -lp "electron ${{ env.VSCODE_ARCH }}" "playwright-install"
124+
npm exec -- npm-run-all -lp "electron ${{ env.VSCODE_ARCH }}" "playwright-install"
125125
break
126126
}
127127
catch {
@@ -230,19 +230,19 @@ jobs:
230230
if: ${{ inputs.electron_tests }}
231231
timeout-minutes: 20
232232
shell: pwsh
233-
run: npm run smoketest-no-compile -- -- --tracing
233+
run: npm run smoketest-no-compile -- --tracing
234234

235235
- name: 🧪 Run smoke tests (Browser, Chromium)
236236
if: ${{ inputs.browser_tests }}
237237
timeout-minutes: 20
238238
shell: pwsh
239-
run: npm run smoketest-no-compile -- -- --web --tracing --headless
239+
run: npm run smoketest-no-compile -- --web --tracing --headless
240240

241241
- name: 🧪 Run smoke tests (Remote)
242242
if: ${{ inputs.remote_tests }}
243243
timeout-minutes: 20
244244
shell: pwsh
245-
run: npm run smoketest-no-compile -- -- --remote --tracing
245+
run: npm run smoketest-no-compile -- --remote --tracing
246246

247247
- name: Diagnostics after smoke test run
248248
shell: pwsh

‎.npmrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
disturl="https://electronjs.org/headers"
2-
target="37.2.3"
3-
ms_build_id="12035395"
2+
target="37.3.1"
3+
ms_build_id="12259562"
44
runtime="electron"
55
build_from_source="true"
66
legacy-peer-deps="true"

‎.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.17.0
1+
22.18.0

‎build/azure-pipelines/linux/setup-env.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ fi
2525

2626
if [ "$npm_config_arch" == "x64" ]; then
2727
# Download clang based on chromium revision used by vscode
28-
curl -s https://raw.githubusercontent.com/chromium/chromium/138.0.7204.100/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux
28+
curl -s https://raw.githubusercontent.com/chromium/chromium/138.0.7204.235/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux
2929

3030
# Download libcxx headers and objects from upstream electron releases
3131
DEBUG=libcxx-fetcher \
@@ -37,9 +37,9 @@ if [ "$npm_config_arch" == "x64" ]; then
3737

3838
# Set compiler toolchain
3939
# Flags for the client build are based on
40-
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/138.0.7204.100:build/config/arm.gni
41-
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/138.0.7204.100:build/config/compiler/BUILD.gn
42-
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/138.0.7204.100:build/config/c++/BUILD.gn
40+
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/138.0.7204.235:build/config/arm.gni
41+
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/138.0.7204.235:build/config/compiler/BUILD.gn
42+
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/138.0.7204.235:build/config/c++/BUILD.gn
4343
export CC="$PWD/.build/CR_Clang/bin/clang --gcc-toolchain=$VSCODE_CLIENT_SYSROOT_DIR/x86_64-linux-gnu"
4444
export CXX="$PWD/.build/CR_Clang/bin/clang++ --gcc-toolchain=$VSCODE_CLIENT_SYSROOT_DIR/x86_64-linux-gnu"
4545
export CXXFLAGS="-nostdinc++ -D__NO_INLINE__ -DSPDLOG_USE_STD_FORMAT -I$PWD/.build/libcxx_headers -isystem$PWD/.build/libcxx_headers/include -isystem$PWD/.build/libcxxabi_headers/include -fPIC -flto=thin -fsplit-lto-unit -D_LIBCPP_ABI_NAMESPACE=Cr -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE --sysroot=$VSCODE_CLIENT_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot"

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

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ parameters:
1111
type: string
1212

1313
steps:
14-
# Additional "--" needed to workaround https://github.com/npm/cli/issues/7375
15-
- powershell: npm exec -- -- npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
14+
- powershell: npm exec -- npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
1615
env:
1716
GITHUB_TOKEN: "$(github-distro-mixin-password)"
1817
displayName: Download Electron and Playwright
@@ -22,14 +21,12 @@ steps:
2221
- powershell: .\scripts\test.bat --build --tfs "Unit Tests"
2322
displayName: 🧪 Run unit tests (Electron)
2423
timeoutInMinutes: 15
25-
# Additional "--" needed to workaround https://github.com/npm/cli/issues/7375
26-
- powershell: npm run test-node -- -- --build
24+
- powershell: npm run test-node -- --build
2725
displayName: 🧪 Run unit tests (node.js)
2826
timeoutInMinutes: 15
2927

3028
- ${{ if eq(parameters.VSCODE_RUN_BROWSER_TESTS, true) }}:
31-
# Additional "--" needed to workaround https://github.com/npm/cli/issues/7375
32-
- powershell: npm run test-browser-no-install -- -- --build --browser chromium --tfs "Browser Unit Tests"
29+
- powershell: npm run test-browser-no-install -- --build --browser chromium --tfs "Browser Unit Tests"
3330
displayName: 🧪 Run unit tests (Browser, Chromium)
3431
timeoutInMinutes: 20
3532

@@ -122,22 +119,19 @@ steps:
122119
condition: succeededOrFailed()
123120

124121
- ${{ if eq(parameters.VSCODE_RUN_ELECTRON_TESTS, true) }}:
125-
# Additional "--" needed to workaround https://github.com/npm/cli/issues/7375
126-
- powershell: npm run smoketest-no-compile -- -- --tracing --build "$(agent.builddirectory)\test\VSCode-win32-$(VSCODE_ARCH)"
122+
- powershell: npm run smoketest-no-compile -- --tracing --build "$(agent.builddirectory)\test\VSCode-win32-$(VSCODE_ARCH)"
127123
displayName: 🧪 Run smoke tests (Electron)
128124
timeoutInMinutes: 20
129125

130126
- ${{ if eq(parameters.VSCODE_RUN_BROWSER_TESTS, true) }}:
131-
# Additional "--" needed to workaround https://github.com/npm/cli/issues/7375
132-
- powershell: npm run smoketest-no-compile -- -- --web --tracing --headless
127+
- powershell: npm run smoketest-no-compile -- --web --tracing --headless
133128
env:
134129
VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)\test\vscode-server-win32-$(VSCODE_ARCH)-web
135130
displayName: 🧪 Run smoke tests (Browser, Chromium)
136131
timeoutInMinutes: 20
137132

138133
- ${{ if eq(parameters.VSCODE_RUN_REMOTE_TESTS, true) }}:
139-
# Additional "--" needed to workaround https://github.com/npm/cli/issues/7375
140-
- powershell: npm run smoketest-no-compile -- -- --tracing --remote --build "$(agent.builddirectory)\test\VSCode-win32-$(VSCODE_ARCH)"
134+
- powershell: npm run smoketest-no-compile -- --tracing --remote --build "$(agent.builddirectory)\test\VSCode-win32-$(VSCODE_ARCH)"
141135
env:
142136
VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)\test\vscode-server-win32-$(VSCODE_ARCH)
143137
displayName: 🧪 Run smoke tests (Remote)

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,12 +256,11 @@ steps:
256256
echo "##vso[task.setvariable variable=EsrpCliDllPath]$Version\net6.0\esrpcli.dll"
257257
displayName: Find ESRP CLI
258258
259-
# Additional "--" needed to workaround https://github.com/npm/cli/issues/7375
260259
- powershell: |
261260
. build/azure-pipelines/win32/exec.ps1
262261
$ErrorActionPreference = "Stop"
263262
mkdir -Force .build/node-cpuprofile
264-
exec { npx deemon --detach --wait -- -- npx zx build/azure-pipelines/win32/codesign.js }
263+
exec { npx deemon --detach --wait -- npx zx build/azure-pipelines/win32/codesign.js }
265264
env:
266265
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
267266
NODE_DEBUG: "net,child_process"
@@ -278,11 +277,10 @@ steps:
278277
VSCODE_TEST_ARTIFACT_NAME: ${{ parameters.VSCODE_TEST_ARTIFACT_NAME }}
279278

280279
- ${{ if ne(parameters.VSCODE_CIBUILD, true) }}:
281-
# Additional "--" needed to workaround https://github.com/npm/cli/issues/7375
282280
- powershell: |
283281
. build/azure-pipelines/win32/exec.ps1
284282
$ErrorActionPreference = "Stop"
285-
exec { npx deemon --attach -- -- npx zx build/azure-pipelines/win32/codesign.js }
283+
exec { npx deemon --attach -- npx zx build/azure-pipelines/win32/codesign.js }
286284
condition: succeededOrFailed()
287285
env:
288286
NODE_DEBUG: "net,child_process"

0 commit comments

Comments
 (0)