diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-08-18 10:00:18 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-08-18 10:00:18 -0700 |
| commit | f4112fc06e126ae4adc4dce99d71d021ff36bf9a (patch) | |
| tree | 9dcd6f609dffdde48e726e8e83f6ddc70c185e4c /tools | |
| parent | 9770206fc41ee51e26bc9d3dedb5a69f2a8c0dc4 (diff) | |
| parent | e1ee20bde6c30f0aa5a6f5309d20971ccd0122a7 (diff) | |
Merge pull request #7741 from nicolasnoble/manual-upmerge
Manual upmerge from v1.0.x to master.
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: |