diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-08-03 13:15:39 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-08-03 13:15:39 -0700 |
| commit | f14effb6e421601639ef9a293f3f9b55a51e87ed (patch) | |
| tree | fedd6af4122c068e033e471684c60e60087fd2b5 /tools | |
| parent | eedc335580c6691f5401674841be0362596e1d9c (diff) | |
| parent | 229b1619f070b6c99cc7c753b446b8d6af6a047b (diff) | |
Merge pull request #7626 from nicolasnoble/manual-upmerge-after-version-bump
Manual upmerge after version bump.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/run_tests/build_csharp_coreclr.sh | 2 | ||||
| -rwxr-xr-x | tools/run_tests/build_package_node.sh | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tools/run_tests/build_csharp_coreclr.sh b/tools/run_tests/build_csharp_coreclr.sh index 733b1a2083..02cf0d39cb 100755 --- a/tools/run_tests/build_csharp_coreclr.sh +++ b/tools/run_tests/build_csharp_coreclr.sh @@ -35,4 +35,4 @@ cd $(dirname $0)/../../src/csharp # TODO(jtattermusch): introduce caching dotnet restore . -dotnet build -f netstandard1.5 --configuration $MSBUILD_CONFIG '**/project.json' +dotnet build --configuration $MSBUILD_CONFIG '**/project.json' diff --git a/tools/run_tests/build_package_node.sh b/tools/run_tests/build_package_node.sh index ef4a10cca7..f20daeaea0 100755 --- a/tools/run_tests/build_package_node.sh +++ b/tools/run_tests/build_package_node.sh @@ -49,7 +49,12 @@ cp grpc-*.tgz $artifacts/grpc.tgz mkdir -p bin -cd src/node/tools +cd $base/src/node/health_check +npm update +npm pack +cp grpc-health-check-*.tgz $artifacts/ + +cd $base/src/node/tools npm update npm pack cp grpc-tools-*.tgz $artifacts/ |