diff --git a/build/.cachesalt b/build/.cachesalt index a454f1220da..4a19f329eb1 100644 --- a/build/.cachesalt +++ b/build/.cachesalt @@ -1 +1 @@ -2024-05-16T14:24:05.381Z +2024-05-25T03:29:59.419Z diff --git a/build/azure-pipelines/linux/product-build-linux-test.yml b/build/azure-pipelines/linux/product-build-linux-test.yml index 4968b9ff04f..f5c00aa0cf0 100644 --- a/build/azure-pipelines/linux/product-build-linux-test.yml +++ b/build/azure-pipelines/linux/product-build-linux-test.yml @@ -100,9 +100,6 @@ steps: timeoutInMinutes: 20 - script: ./scripts/test-remote-integration.sh - env: - # TODO(deepak1556): Remove this once we update to Node.js >= 20.11.x - UV_USE_IO_URING: 0 displayName: Run integration tests (Remote) timeoutInMinutes: 20 @@ -137,8 +134,6 @@ steps: ./scripts/test-remote-integration.sh env: VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH) - # TODO(deepak1556): Remove this once we update to Node.js >= 20.11.x - UV_USE_IO_URING: 0 displayName: Run integration tests (Remote) timeoutInMinutes: 20 @@ -169,16 +164,10 @@ steps: - script: yarn smoketest-no-compile --web --tracing --headless --electronArgs="--disable-dev-shm-usage" timeoutInMinutes: 20 - env: - # TODO(deepak1556): Remove this once we update to Node.js >= 20.11.x - UV_USE_IO_URING: 0 displayName: Run smoke tests (Browser, Chromium) - script: yarn smoketest-no-compile --remote --tracing timeoutInMinutes: 20 - env: - # TODO(deepak1556): Remove this once we update to Node.js >= 20.11.x - UV_USE_IO_URING: 0 displayName: Run smoke tests (Remote) - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: @@ -189,8 +178,6 @@ steps: - script: yarn smoketest-no-compile --web --tracing --headless --electronArgs="--disable-dev-shm-usage" env: VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)-web - # TODO(deepak1556): Remove this once we update to Node.js >= 20.11.x - UV_USE_IO_URING: 0 timeoutInMinutes: 20 displayName: Run smoke tests (Browser, Chromium) @@ -201,9 +188,6 @@ steps: VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)" \ yarn smoketest-no-compile --tracing --remote --build "$APP_PATH" timeoutInMinutes: 20 - env: - # TODO(deepak1556): Remove this once we update to Node.js >= 20.11.x - UV_USE_IO_URING: 0 displayName: Run smoke tests (Remote) - script: | diff --git a/build/checksums/nodejs.txt b/build/checksums/nodejs.txt index 63d24a93ab6..bcc9340406d 100644 --- a/build/checksums/nodejs.txt +++ b/build/checksums/nodejs.txt @@ -1,7 +1,7 @@ -31d2d46ae8d8a3982f54e2ff1e60c2e4a8e80bf78a3e8b46dcaac95ac5d7ce6a node-v20.9.0-darwin-arm64.tar.gz -fc5b73f2a78c17bbe926cdb1447d652f9f094c79582f1be6471b4b38a2e1ccc8 node-v20.9.0-darwin-x64.tar.gz -d2a7dbeeb274bfd16b579d2cafb92f673010df36c83a5b55de3916aad6806a6a node-v20.9.0-linux-arm64.tar.gz -a28a0de05177106d241ef426b3e006022bc7d242224adace7565868bd9ee6c06 node-v20.9.0-linux-armv7l.tar.gz -f0919f092fbf74544438907fa083c21e76b2d7a4bc287f0607ada1553ef16f60 node-v20.9.0-linux-x64.tar.gz -54e165b89e75158993910053db5b0e652c1826521e624126de5ca6de9ff7b06d win-arm64/node.exe -538140015da83597ea7e7ef5e108ebac8a2dc4784b2a4134222b6c27c39f90ad win-x64/node.exe +e0065c61f340e85106a99c4b54746c5cee09d59b08c5712f67f99e92aa44995d node-v20.11.1-darwin-arm64.tar.gz +c52e7fb0709dbe63a4cbe08ac8af3479188692937a7bd8e776e0eedfa33bb848 node-v20.11.1-darwin-x64.tar.gz +e34ab2fc2726b4abd896bcbff0250e9b2da737cbd9d24267518a802ed0606f3b node-v20.11.1-linux-arm64.tar.gz +e42791f76ece283c7a4b97fbf716da72c5128c54a9779f10f03ae74a4bcfb8f6 node-v20.11.1-linux-armv7l.tar.gz +bf3a779bef19452da90fb88358ec2c57e0d2f882839b20dc6afc297b6aafc0d7 node-v20.11.1-linux-x64.tar.gz +a5a9d30a8f7d56e00ccb27c1a7d24c8d0bc96a2689ebba8eb7527698793496f1 win-arm64/node.exe +bc585910690318aaebe3c57669cb83ca9d1e5791efd63195e238f54686e6c2ec win-x64/node.exe diff --git a/cgmanifest.json b/cgmanifest.json index f1e4192dc28..61747342eef 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -516,11 +516,11 @@ "git": { "name": "nodejs", "repositoryUrl": "https://github.com/nodejs/node", - "commitHash": "22f383dcd529d6bf790856db614a35fea78e825f" + "commitHash": "9b1bf44ea9e7785e38c93b7d22d32dbca262df6c" } }, "isOnlyProductionDependency": true, - "version": "20.9.0" + "version": "20.11.1" }, { "component": { diff --git a/package.json b/package.json index 6bd79ca053e..36a60bee91e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", "version": "1.90.0", - "distro": "0f8d3c619e9a416854972b1f496b1eedc727ab18", + "distro": "0263315aff0fc2c40701c5b26cfc53a6f76bf058", "author": { "name": "Microsoft Corporation" }, diff --git a/remote/.yarnrc b/remote/.yarnrc index 3a01071e2ba..4c99388e889 100644 --- a/remote/.yarnrc +++ b/remote/.yarnrc @@ -1,5 +1,5 @@ disturl "https://nodejs.org/dist" -target "20.9.0" -ms_build_id "274207" +target "20.11.1" +ms_build_id "275039" runtime "node" build_from_source "true" diff --git a/resources/server/bin/code-server-linux.sh b/resources/server/bin/code-server-linux.sh index 9229ec89a0e..3df32dfd43c 100644 --- a/resources/server/bin/code-server-linux.sh +++ b/resources/server/bin/code-server-linux.sh @@ -9,8 +9,4 @@ esac ROOT="$(dirname "$(dirname "$(readlink -f "$0")")")" -# workaround for https://github.com/microsoft/vscode/issues/212678 -# Remove this once we update to Node.js >= 20.11.x -export UV_USE_IO_URING=0 - "$ROOT/node" ${INSPECT:-} "$ROOT/out/server-main.js" "$@"