From f38ad8b6a205fd475d5fe964833110299780a78f Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Tue, 10 Oct 2023 13:49:41 +0200 Subject: [PATCH] fix(windows): path of node-gyp with spectre mitigation (#1690) --- prepare_vscode.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/prepare_vscode.sh b/prepare_vscode.sh index 46d920966c7..d798fa4d581 100755 --- a/prepare_vscode.sh +++ b/prepare_vscode.sh @@ -63,7 +63,7 @@ if [[ "${OS_NAME}" == "linux" ]]; then fi if [[ "${OS_NAME}" == "osx" ]]; then - CHILD_CONCURRENCY=1 yarn --network-timeout 180000 + CHILD_CONCURRENCY=1 yarn --frozen-lockfile --network-timeout 180000 yarn postinstall else @@ -81,7 +81,7 @@ else git am --3way --whitespace=fix ../../build/npm/gyp/patches/gyp_spectre_mitigation_support.patch npm install - npm_config_node_gyp=$( pwd ) + npm_config_node_gyp="$( pwd )/bin/node-gyp.js" export npm_config_node_gyp cd ../.. @@ -91,7 +91,7 @@ else export npm_config_arm_version=7 fi - CHILD_CONCURRENCY=1 yarn --check-files --network-timeout 180000 + CHILD_CONCURRENCY=1 yarn --frozen-lockfile --check-files --network-timeout 180000 fi setpath() {