From c0b9d9b51bbc4032c288f6d4c2cc588a2518c357 Mon Sep 17 00:00:00 2001 From: Michael Lumish Date: Thu, 7 May 2020 11:30:15 -0700 Subject: [PATCH] Use nvm directly in linux scripts, use kokoro script for Windows --- .github/workflows/build.yml | 4 ++-- .../tools/run_tests/artifacts/build_artifact_electron.sh | 2 ++ .../tools/run_tests/artifacts/build_artifact_node.sh | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dc211bf0..e0029cc4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -136,7 +136,7 @@ jobs: - name: Build env: ARTIFACTS_OUT: '%GITHUB_WORKSPACE%/artifacts' - run: packages\grpc-native-core\tools\run_tests\artifacts\build_artifact_node.bat + run: tools/release/kokoro-electron.bat - uses: actions/upload-artifact@v2 with: name: windows-nodejs @@ -160,7 +160,7 @@ jobs: - name: Build env: ARTIFACTS_OUT: '%GITHUB_WORKSPACE%/artifacts' - run: packages\grpc-native-core\tools\run_tests\artifacts\build_artifact_electron.bat + run: tools/release/kokoro-electron.bat - uses: actions/upload-artifact@v2 with: name: windows-electron diff --git a/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_electron.sh b/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_electron.sh index bc288410..4b397e5b 100755 --- a/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_electron.sh +++ b/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_electron.sh @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" && nvm install 12 + set -ex arch_list=( ia32 x64 ) 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 4f459dc6..32ddd7df 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,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" && nvm install 12 + set -ex arch_list=( ia32 x64 )