diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-08-16 00:57:57 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-08-16 01:54:33 +0200 |
| commit | e1ee20bde6c30f0aa5a6f5309d20971ccd0122a7 (patch) | |
| tree | 5d89668ab96d6d1e3f5274480d9f75a6a76f5be4 /tools | |
| parent | 8d46873e8f2e675e7f41d16861b531ffe3e62103 (diff) | |
| parent | e4947befe26c8f33ab05dace34c2988ac394de59 (diff) | |
Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/run_tests/build_package_node.sh | 1 | ||||
| -rw-r--r-- | tools/run_tests/package_targets.py | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/tools/run_tests/build_package_node.sh b/tools/run_tests/build_package_node.sh index f20daeaea0..a5636cf87a 100755 --- a/tools/run_tests/build_package_node.sh +++ b/tools/run_tests/build_package_node.sh @@ -50,7 +50,6 @@ cp grpc-*.tgz $artifacts/grpc.tgz mkdir -p bin cd $base/src/node/health_check -npm update npm pack cp grpc-health-check-*.tgz $artifacts/ diff --git a/tools/run_tests/package_targets.py b/tools/run_tests/package_targets.py index ce3f08dfbc..5e6de2e317 100644 --- a/tools/run_tests/package_targets.py +++ b/tools/run_tests/package_targets.py @@ -81,7 +81,14 @@ class CSharpPackage: self.labels += ['windows'] def pre_build_jobspecs(self): - return [] + if 'windows' in self.labels: + return [create_jobspec('prebuild_%s' % self.name, + ['tools\\run_tests\\pre_build_csharp.bat'], + shell=True, + flake_retries=5, + timeout_retries=2)] + else: + return [] def build_jobspec(self): if self.use_coreclr: |