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 2c4ee6f3..31d062f7 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 @@ -12,9 +12,6 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. -call nvm install 10 -call nvm use 10 - set arch_list=ia32 x64 set node_versions=4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 9.0.0 10.0.0 diff --git a/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.sh b/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.sh index 303fd3ec..3120d6d3 100755 --- a/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.sh +++ b/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.sh @@ -13,9 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -nvm install 10 -nvm use 10 - set -ex arch_list=( ia32 x64 ) diff --git a/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node_arm.sh b/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node_arm.sh index e7e301ed..34d9ffac 100755 --- a/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node_arm.sh +++ b/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node_arm.sh @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -nvm install 10 -nvm use 10 - set -ex +# https://github.com/mapbox/node-pre-gyp/issues/362 +npm install -g node-gyp + cd $(dirname $0)/../../.. rm -rf build || true diff --git a/tools/release/kokoro.bat b/tools/release/kokoro.bat index c55ddbf3..d26f58b3 100644 --- a/tools/release/kokoro.bat +++ b/tools/release/kokoro.bat @@ -17,6 +17,11 @@ powershell -c "& { iwr https://raw.githubusercontent.com/grumpycoders/nvm-ps/master/nvm.ps1 | iex }" SET PATH=%APPDATA%\nvm-ps;%APPDATA%\nvm-ps\nodejs;%PATH% +call nvm install 10 +call nvm use 10 + +call npm install -g npm +call npm install -g node-gyp cd /d %~dp0 cd ..\.. diff --git a/tools/release/kokoro.sh b/tools/release/kokoro.sh index 37e61ea7..4b0fe37d 100755 --- a/tools/release/kokoro.sh +++ b/tools/release/kokoro.sh @@ -17,6 +17,11 @@ curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" +nvm install 10 +nvm use 10 +npm install -g npm +npm install -g node-gyp + set -ex cd $(dirname $0)/../.. base_dir=$(pwd)