From c55edf7107be2d0d1489d38e7a72181bdee0dbbe Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Mon, 17 Jun 2019 10:30:35 -0700 Subject: [PATCH] Use known-working environment variable --- packages/grpc-native-core/gulpfile.ts | 2 +- .../tools/run_tests/artifacts/build_artifact_node.bat | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/grpc-native-core/gulpfile.ts b/packages/grpc-native-core/gulpfile.ts index 1d5c5ee2..dbfc2228 100644 --- a/packages/grpc-native-core/gulpfile.ts +++ b/packages/grpc-native-core/gulpfile.ts @@ -44,7 +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.CSIDL_LOCAL_APPDATA, 'node-gyp/cache', process.versions.node, 'include/node/openssl'), { force: true })).then(() => +del(path.resolve(process.env.USERPROFILE, 'AppData/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 0d9df783..3a094f1e 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 @@ -26,8 +26,6 @@ call npm update || goto :error mkdir -p %ARTIFACTS_OUT% -@echo on - for %%a in (%arch_list%) do ( for %%v in (%node_versions%) do ( call .\node_modules\.bin\node-pre-gyp.cmd configure build --target=%%v --target_arch=%%a @@ -35,8 +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 "%CSIDL_LOCAL_APPDATA%\node-gyp\cache\%%v\include\node\openssl" /S /Q - rmdir "%CSIDL_LOCAL_APPDATA%\node-gyp\cache\iojs-%%v\include\node\openssl" /S /Q + rmdir "%USERPROFILE%\AppData\node-gyp\cache\%%v\include\node\openssl" /S /Q + rmdir "%USERPROFILE%\AppData\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