Skip to content
Snippets Groups Projects
Commit 6dce2f5d authored by Jan Tattermusch's avatar Jan Tattermusch
Browse files

adjust C# win artifact build

parent dd900d55
No related branches found
No related tags found
No related merge requests found
...@@ -183,24 +183,14 @@ class CSharpExtArtifact: ...@@ -183,24 +183,14 @@ class CSharpExtArtifact:
self.labels = ['artifact', 'csharp', platform, arch] self.labels = ['artifact', 'csharp', platform, arch]
def pre_build_jobspecs(self): def pre_build_jobspecs(self):
if self.platform == 'windows': return []
return [create_jobspec('prebuild_%s' % self.name,
['tools\\run_tests\\helper_scripts\\pre_build_c.bat'],
shell=True,
flake_retries=5,
timeout_retries=2)]
else:
return []
def build_jobspec(self): def build_jobspec(self):
if self.platform == 'windows': if self.platform == 'windows':
msbuild_platform = 'Win32' if self.arch == 'x86' else self.arch cmake_arch_option = 'Win32' if self.arch == 'x86' else self.arch
return create_jobspec(self.name, return create_jobspec(self.name,
['tools\\run_tests\\artifacts\\build_artifact_csharp.bat', ['tools\\run_tests\\artifacts\\build_artifact_csharp.bat',
'vsprojects\\grpc_csharp_ext.sln', cmake_arch_option],
'/p:Configuration=Release',
'/p:PlatformToolset=v120',
'/p:Platform=%s' % msbuild_platform],
shell=True) shell=True)
else: else:
environ = {'CONFIG': 'opt', environ = {'CONFIG': 'opt',
......
...@@ -29,10 +29,16 @@ ...@@ -29,10 +29,16 @@
@rem Builds C# artifacts on Windows @rem Builds C# artifacts on Windows
@call vsprojects\build_vs2013.bat %* || goto :error set ARCHITECTURE=%1
@call tools\run_tests\helper_scripts\pre_build_csharp.bat %ARCHITECTURE% || goto :error
cd cmake\build\%ARCHITECTURE%
cmake --build . --target grpc_csharp_ext --config Release
cd ..\..\..
mkdir artifacts mkdir artifacts
copy /Y vsprojects\Release\grpc_csharp_ext.dll artifacts || copy /Y vsprojects\x64\Release\grpc_csharp_ext.dll artifacts || goto :error copy /Y cmake\build\Win32\Release\grpc_csharp_ext.dll artifacts || copy /Y cmake\build\x64\Release\grpc_csharp_ext.dll artifacts || goto :error
goto :EOF goto :EOF
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment