diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2016-01-22 14:58:24 -0800 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2016-01-22 14:58:24 -0800 |
| commit | 38b06fbc3519352f97ad8ea6fb817e80b93e7451 (patch) | |
| tree | 9ed2d245d36b43bcbd9d3f2e1dd74c185be6bce9 /tools | |
| parent | dadf6ba8970f0da96e8068ce44c0dcb62f4bac4a (diff) | |
make sure we embed openssl and zlib in artifacts
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/run_tests/build_artifacts.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/tools/run_tests/build_artifacts.py b/tools/run_tests/build_artifacts.py index 0fd5bc63f3..ff9dd4735a 100755 --- a/tools/run_tests/build_artifacts.py +++ b/tools/run_tests/build_artifacts.py @@ -129,18 +129,19 @@ class CSharpExtArtifact: '/p:PlatformToolset=v120', '/p:Platform=%s' % msbuild_platform], shell=True) - if self.platform == 'linux': - environ = {'CONFIG': 'opt'} - return create_docker_jobspec(self.name, - 'tools/jenkins/grpc_artifact_linux_%s' % self.arch, - 'tools/run_tests/build_artifact_csharp.sh') else: - environ = {'CONFIG': 'opt'} - if self.platform == 'macos': + environ = {'CONFIG': 'opt', + 'EMBED_OPENSSL': 'true', + 'EMBED_ZLIB': 'true'} + if self.platform == 'linux': + return create_docker_jobspec(self.name, + 'tools/jenkins/grpc_artifact_linux_%s' % self.arch, + 'tools/run_tests/build_artifact_csharp.sh') + else: environ.update(macos_arch_env(self.arch)) - return create_jobspec(self.name, - ['tools/run_tests/build_artifact_csharp.sh'], - environ=environ) + return create_jobspec(self.name, + ['tools/run_tests/build_artifact_csharp.sh'], + environ=environ) def __str__(self): return self.name |