grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #918 from murgatroid99/windows_build_fix 

Delete another directory in Windows build script
This commit is contained in:
Michael Lumish 2019-06-19 12:29:10 -07:00 committed by GitHub
parent b4e24beba5 aed0706bf6
commit c08cb62d97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/grpc-native-core/gulpfile.ts
View File

@ -44,6 +44,7 @@ const installWindows = () => {
return execa('npm', ['install', '--build-from-source'], return execa('npm', ['install', '--build-from-source'],
{cwd: nativeCoreDir, stdio: 'inherit'}).catch(() => {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, '.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'], execa('npm', ['install', '--build-from-source'],
{cwd: nativeCoreDir, stdio: 'inherit'}) {cwd: nativeCoreDir, stdio: 'inherit'})
)); ));

2
packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.bat
View File

@ -33,6 +33,8 @@ for %%a in (%arch_list%) do (
@rem Try again after removing openssl headers @rem Try again after removing openssl headers
rmdir "%USERPROFILE%\.node-gyp\%%v\include\node\openssl" /S /Q rmdir "%USERPROFILE%\.node-gyp\%%v\include\node\openssl" /S /Q
rmdir "%USERPROFILE%\.node-gyp\iojs-%%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 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 xcopy /Y /I /S build\stage\* %ARTIFACTS_OUT%\ || goto :error

2
tools/release/kokoro-electron.bat
View File

@ -22,7 +22,7 @@ call nvm use 10
call npm install -g npm call npm install -g npm
@rem https://github.com/mapbox/node-pre-gyp/issues/362 @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 /d %~dp0
cd ..\.. cd ..\..

2
tools/release/kokoro-electron.sh
View File

@ -21,7 +21,7 @@ nvm install 10
nvm use 10 nvm use 10
npm install -g npm npm install -g npm
# https://github.com/mapbox/node-pre-gyp/issues/362 # https://github.com/mapbox/node-pre-gyp/issues/362
npm install -g node-gyp npm install -g node-gyp@3
set -ex set -ex
cd $(dirname $0)/../.. cd $(dirname $0)/../..

2
tools/release/kokoro-nodejs.bat
View File

@ -22,7 +22,7 @@ call nvm use 10
call npm install -g npm call npm install -g npm
@rem https://github.com/mapbox/node-pre-gyp/issues/362 @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 /d %~dp0
cd ..\.. cd ..\..