Bladeren bron

fix(windows): path of node-gyp with spectre mitigation (#1690)

Baptiste Augrain 1 jaar geleden
bovenliggende
commit
f38ad8b6a2
1 gewijzigde bestanden met toevoegingen van 3 en 3 verwijderingen
  1. 3 3
      prepare_vscode.sh

+ 3 - 3
prepare_vscode.sh

@@ -63,7 +63,7 @@ if [[ "${OS_NAME}" == "linux" ]]; then
 fi
 fi
 
 
 if [[ "${OS_NAME}" == "osx" ]]; then
 if [[ "${OS_NAME}" == "osx" ]]; then
-  CHILD_CONCURRENCY=1 yarn --network-timeout 180000
+  CHILD_CONCURRENCY=1 yarn --frozen-lockfile --network-timeout 180000
 
 
   yarn postinstall
   yarn postinstall
 else
 else
@@ -81,7 +81,7 @@ else
     git am --3way --whitespace=fix ../../build/npm/gyp/patches/gyp_spectre_mitigation_support.patch
     git am --3way --whitespace=fix ../../build/npm/gyp/patches/gyp_spectre_mitigation_support.patch
     npm install
     npm install
 
 
-    npm_config_node_gyp=$( pwd )
+    npm_config_node_gyp="$( pwd )/bin/node-gyp.js"
     export npm_config_node_gyp
     export npm_config_node_gyp
 
 
     cd ../..
     cd ../..
@@ -91,7 +91,7 @@ else
     export npm_config_arm_version=7
     export npm_config_arm_version=7
   fi
   fi
 
 
-  CHILD_CONCURRENCY=1 yarn --check-files --network-timeout 180000
+  CHILD_CONCURRENCY=1 yarn --frozen-lockfile --check-files --network-timeout 180000
 fi
 fi
 
 
 setpath() {
 setpath() {