From 54e81fdd1e12905a6959afdd5516537b7c4ca92a Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Tue, 11 Feb 2020 15:20:52 -0800 Subject: [PATCH] Use correct environment variables in new windows build script --- .../tools/run_tests/artifacts/build_one_artifact.bat | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/grpc-native-core/tools/run_tests/artifacts/build_one_artifact.bat b/packages/grpc-native-core/tools/run_tests/artifacts/build_one_artifact.bat index 0a91e5a3..9b3829d2 100644 --- a/packages/grpc-native-core/tools/run_tests/artifacts/build_one_artifact.bat +++ b/packages/grpc-native-core/tools/run_tests/artifacts/build_one_artifact.bat @@ -45,13 +45,13 @@ if "%RUNTIME%"=="electron" ( set "npm_config_disturl=https://atom.io/download/electron" ) -call .\node_modules\.bin\node-pre-gyp.cmd configure build --target=%%v --target_arch=%%a && goto :EOF +call .\node_modules\.bin\node-pre-gyp.cmd configure build --target=%VERSION% --target_arch=%ARCH% && goto :EOF @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 +rmdir "%USERPROFILE%\.node-gyp\%VERSION%\include\node\openssl" /S /Q +rmdir "%USERPROFILE%\.node-gyp\iojs-%VERSION%\include\node\openssl" /S /Q +rmdir "%USERPROFILE%\AppData\Local\node-gyp\cache\%VERSION%\include\node\openssl" /S /Q +rmdir "%USERPROFILE%\AppData\Local\node-gyp\cache\iojs-%VERSION%\include\node\openssl" /S /Q +call .\node_modules\.bin\node-pre-gyp.cmd build package --target=%VERSION% --target_arch=%ARCH% || goto :error xcopy /Y /I /S build\stage\* %ARTIFACTS_OUT%\ || goto :error