diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2018-05-12 18:18:25 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-05-12 18:18:25 +0200 |
| commit | 23e17baa23e325e6a92fa84252b5bab1786a0e37 (patch) | |
| tree | d11964b85cd0143434b316b5ed9cc02a65287e58 /tools | |
| parent | 5190ed70cf707419be2cb580781b1be64ef0af34 (diff) | |
| parent | 32c41e8d729b040c556389ca294125bcd3757639 (diff) | |
Merge pull request #15332 from jtattermusch/avoid_csharp_artifact_concurrency
Avoid unneeded dotnet restore in artifact builds
Diffstat (limited to 'tools')
4 files changed, 7 insertions, 17 deletions
diff --git a/tools/run_tests/artifacts/build_artifact_csharp.bat b/tools/run_tests/artifacts/build_artifact_csharp.bat index 91fdb0d29e..a84bc54157 100644 --- a/tools/run_tests/artifacts/build_artifact_csharp.bat +++ b/tools/run_tests/artifacts/build_artifact_csharp.bat @@ -15,7 +15,7 @@ @rem Builds C# artifacts on Windows set ARCHITECTURE=%1 - +set GRPC_SKIP_DOTNET_RESTORE=true @call tools\run_tests\helper_scripts\pre_build_csharp.bat %ARCHITECTURE% || goto :error cd cmake\build\%ARCHITECTURE% diff --git a/tools/run_tests/artifacts/build_artifact_protoc.bat b/tools/run_tests/artifacts/build_artifact_protoc.bat index 2e9aae8148..1d5bf034d5 100644 --- a/tools/run_tests/artifacts/build_artifact_protoc.bat +++ b/tools/run_tests/artifacts/build_artifact_protoc.bat @@ -22,11 +22,7 @@ cd cmake mkdir build cd build -@rem TODO(jtattermusch): Stop hardcoding path to yasm once Jenkins workers can locate yasm correctly -@rem If yasm is not on the path, use hardcoded path instead. -yasm --version || set USE_HARDCODED_YASM_PATH_MAYBE=-DCMAKE_ASM_NASM_COMPILER="C:/Program Files (x86)/yasm/yasm.exe" - -cmake -G "%generator%" -DgRPC_BUILD_TESTS=OFF -DgRPC_MSVC_STATIC_RUNTIME=ON %USE_HARDCODED_YASM_PATH_MAYBE% ../.. || goto :error +cmake -G "%generator%" -DgRPC_BUILD_TESTS=OFF -DgRPC_MSVC_STATIC_RUNTIME=ON ../.. || goto :error cmake --build . --target protoc --config Release || goto :error cmake --build . --target plugins --config Release || goto :error cd ..\.. diff --git a/tools/run_tests/helper_scripts/pre_build_cmake.bat b/tools/run_tests/helper_scripts/pre_build_cmake.bat index d89fc5fec2..f0777760aa 100644 --- a/tools/run_tests/helper_scripts/pre_build_cmake.bat +++ b/tools/run_tests/helper_scripts/pre_build_cmake.bat @@ -24,11 +24,7 @@ cd cmake mkdir build cd build -@rem TODO(jtattermusch): Stop hardcoding path to yasm once Jenkins workers can locate yasm correctly -@rem If yasm is not on the path, use hardcoded path instead. -yasm --version || set USE_HARDCODED_YASM_PATH_MAYBE=-DCMAKE_ASM_NASM_COMPILER="C:/Program Files (x86)/yasm/yasm.exe" - -cmake -G %GENERATOR% -A %ARCHITECTURE% -DgRPC_BUILD_TESTS=ON %USE_HARDCODED_YASM_PATH_MAYBE% ../.. || goto :error +cmake -G %GENERATOR% -A %ARCHITECTURE% -DgRPC_BUILD_TESTS=ON ../.. || goto :error endlocal diff --git a/tools/run_tests/helper_scripts/pre_build_csharp.bat b/tools/run_tests/helper_scripts/pre_build_csharp.bat index 63f6645620..2ae870ebb1 100644 --- a/tools/run_tests/helper_scripts/pre_build_csharp.bat +++ b/tools/run_tests/helper_scripts/pre_build_csharp.bat @@ -28,15 +28,13 @@ cd build mkdir %ARCHITECTURE% cd %ARCHITECTURE% -@rem TODO(jtattermusch): Stop hardcoding path to yasm once Jenkins workers can locate yasm correctly -@rem If yasm is not on the path, use hardcoded path instead. -yasm --version || set USE_HARDCODED_YASM_PATH_MAYBE=-DCMAKE_ASM_NASM_COMPILER="C:/Program Files (x86)/yasm/yasm.exe" - -cmake -G "Visual Studio 14 2015" -A %ARCHITECTURE% -DgRPC_BUILD_TESTS=OFF -DgRPC_MSVC_STATIC_RUNTIME=ON %USE_HARDCODED_YASM_PATH_MAYBE% ../../.. || goto :error +cmake -G "Visual Studio 14 2015" -A %ARCHITECTURE% -DgRPC_BUILD_TESTS=OFF -DgRPC_MSVC_STATIC_RUNTIME=ON ../../.. || goto :error cd ..\..\..\src\csharp -dotnet restore Grpc.sln || goto :error +if NOT DEFINED GRPC_SKIP_DOTNET_RESTORE ( + dotnet restore Grpc.sln || goto :error +) endlocal |