diff --git a/packages/grpc-native-core/gulpfile.ts b/packages/grpc-native-core/gulpfile.ts index cfb601d0..6950f06d 100644 --- a/packages/grpc-native-core/gulpfile.ts +++ b/packages/grpc-native-core/gulpfile.ts @@ -44,6 +44,7 @@ const installWindows = () => { return execa('npm', ['install', '--build-from-source'], {cwd: nativeCoreDir, stdio: 'inherit'}).catch(() => del(path.resolve(process.env.USERPROFILE, '.node-gyp', process.versions.node, 'include/node/openssl'), { force: true }).then(() => +del(path.resolve(process.env.USERPROFILE, 'AppData/Local/node-gyp/cache', process.versions.node, 'include/node/openssl'), { force: true })).then(() => execa('npm', ['install', '--build-from-source'], {cwd: nativeCoreDir, stdio: 'inherit'}) )); diff --git a/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.bat b/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.bat index 7f862edc..3dcb6c20 100644 --- a/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.bat +++ b/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.bat @@ -33,6 +33,8 @@ for %%a in (%arch_list%) do ( @rem Try again after removing openssl headers rmdir "%USERPROFILE%\.node-gyp\%%v\include\node\openssl" /S /Q rmdir "%USERPROFILE%\.node-gyp\iojs-%%v\include\node\openssl" /S /Q + rmdir "%USERPROFILE%\AppData\Local\node-gyp\cache\%%v\include\node\openssl" /S /Q + rmdir "%USERPROFILE%\AppData\Local\node-gyp\cache\iojs-%%v\include\node\openssl" /S /Q call .\node_modules\.bin\node-pre-gyp.cmd build package --target=%%v --target_arch=%%a || goto :error xcopy /Y /I /S build\stage\* %ARTIFACTS_OUT%\ || goto :error diff --git a/tools/release/kokoro-electron.bat b/tools/release/kokoro-electron.bat index 52e2fb1f..4bc1d0a2 100644 --- a/tools/release/kokoro-electron.bat +++ b/tools/release/kokoro-electron.bat @@ -22,7 +22,7 @@ call nvm use 10 call npm install -g npm @rem https://github.com/mapbox/node-pre-gyp/issues/362 -call npm install -g node-gyp +call npm install -g node-gyp@3 cd /d %~dp0 cd ..\.. diff --git a/tools/release/kokoro-electron.sh b/tools/release/kokoro-electron.sh index cfb9d153..1305c1ae 100755 --- a/tools/release/kokoro-electron.sh +++ b/tools/release/kokoro-electron.sh @@ -21,7 +21,7 @@ nvm install 10 nvm use 10 npm install -g npm # https://github.com/mapbox/node-pre-gyp/issues/362 -npm install -g node-gyp +npm install -g node-gyp@3 set -ex cd $(dirname $0)/../.. diff --git a/tools/release/kokoro-nodejs.bat b/tools/release/kokoro-nodejs.bat index d73a592a..0655d2df 100644 --- a/tools/release/kokoro-nodejs.bat +++ b/tools/release/kokoro-nodejs.bat @@ -22,7 +22,7 @@ call nvm use 10 call npm install -g npm @rem https://github.com/mapbox/node-pre-gyp/issues/362 -call npm install -g node-gyp +call npm install -g node-gyp@3 cd /d %~dp0 cd ..\..