Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Delete another directory in Windows build script #918

Merged
merged 8 commits into from
Jun 19, 2019
Merged

Delete another directory in Windows build script #918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f55b487
Delete another directory in Windows build script
murgatroid99 Jun 13, 2019
0e47c12
Make the same change in the other build script
murgatroid99 Jun 14, 2019
7c5f2ce
Echo commands to see what's going wrong
murgatroid99 Jun 14, 2019
c55edf7
Use known-working environment variable
murgatroid99 Jun 17, 2019
58ce277
Forgot the 'Local' directory component
murgatroid99 Jun 17, 2019
b484cc2
Use older version of node-gyp
murgatroid99 Jun 18, 2019
31d6f43
Also use older node-gyp for electron builds
murgatroid99 Jun 18, 2019
aed0706
Maybe node-gyp 3 will do it
murgatroid99 Jun 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/grpc-native-core/gulpfile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'})
));
Expand Down
2 changes: 2 additions & 0 deletions packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/release/kokoro-electron.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..\..
Expand Down
2 changes: 1 addition & 1 deletion tools/release/kokoro-electron.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)/../..
Expand Down
2 changes: 1 addition & 1 deletion tools/release/kokoro-nodejs.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..\..
Expand Down