make sure we embed openssl and zlib in artifacts

pull/4849/head
Jan Tattermusch 9 years ago
parent dadf6ba897
commit 38b06fbc35
  1. 21
      tools/run_tests/build_artifacts.py

@ -129,18 +129,19 @@ class CSharpExtArtifact:
'/p:PlatformToolset=v120', '/p:PlatformToolset=v120',
'/p:Platform=%s' % msbuild_platform], '/p:Platform=%s' % msbuild_platform],
shell=True) 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: else:
environ = {'CONFIG': 'opt'} environ = {'CONFIG': 'opt',
if self.platform == 'macos': '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)) environ.update(macos_arch_env(self.arch))
return create_jobspec(self.name, return create_jobspec(self.name,
['tools/run_tests/build_artifact_csharp.sh'], ['tools/run_tests/build_artifact_csharp.sh'],
environ=environ) environ=environ)
def __str__(self): def __str__(self):
return self.name return self.name

Loading…
Cancel
Save