diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2018-08-01 09:01:23 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-08-01 09:01:23 +0100 |
| commit | 5439b8377478337954bd23d522d2b7138fa20442 (patch) | |
| tree | 385d5717c051bb4e68198ce9260177d3f57d9da0 /templates | |
| parent | c3ce44e1168ee5d5f6ba4b9ddc455afeebefa200 (diff) | |
| parent | 98680f8d1f01c4458b467dd46b9f135364f9466e (diff) | |
Merge pull request #16196 from jtattermusch/remove_jenkins_refs_build_packages
Cleanup: remove Jenkins references from build_packages scripts
Diffstat (limited to 'templates')
| -rwxr-xr-x | templates/src/csharp/build_packages_dotnetcli.bat.template | 8 | ||||
| -rwxr-xr-x | templates/src/csharp/build_packages_dotnetcli.sh.template | 6 |
2 files changed, 1 insertions, 13 deletions
diff --git a/templates/src/csharp/build_packages_dotnetcli.bat.template b/templates/src/csharp/build_packages_dotnetcli.bat.template index 45010fec74..2ae909f53a 100755 --- a/templates/src/csharp/build_packages_dotnetcli.bat.template +++ b/templates/src/csharp/build_packages_dotnetcli.bat.template @@ -23,18 +23,12 @@ mkdir ..\..\artifacts - @rem Collect the artifacts built by the previous build step if running on Jenkins + @rem Collect the artifacts built by the previous build step mkdir nativelibs - @rem Jenkins flow (deprecated) - powershell -Command "cp -r ..\..\platform=*\artifacts\csharp_ext_* nativelibs" - @rem Kokoro flow powershell -Command "cp -r ..\..\input_artifacts\csharp_ext_* nativelibs" @rem Collect protoc artifacts built by the previous build step mkdir protoc_plugins - @rem Jenkins flow (deprecated) - powershell -Command "cp -r ..\..\platform=*\artifacts\protoc_* protoc_plugins" - @rem Kokoro flow powershell -Command "cp -r ..\..\input_artifacts\protoc_* protoc_plugins" %%DOTNET% restore Grpc.sln || goto :error diff --git a/templates/src/csharp/build_packages_dotnetcli.sh.template b/templates/src/csharp/build_packages_dotnetcli.sh.template index 1172582ebd..d3b17664b1 100755 --- a/templates/src/csharp/build_packages_dotnetcli.sh.template +++ b/templates/src/csharp/build_packages_dotnetcli.sh.template @@ -23,16 +23,10 @@ # Collect the artifacts built by the previous build step mkdir -p nativelibs - # Jenkins flow (deprecated) - cp -r $EXTERNAL_GIT_ROOT/platform={windows,linux,macos}/artifacts/csharp_ext_* nativelibs || true - # Kokoro flow cp -r $EXTERNAL_GIT_ROOT/input_artifacts/csharp_ext_* nativelibs || true # Collect protoc artifacts built by the previous build step mkdir -p protoc_plugins - # Jenkins flow (deprecated) - cp -r $EXTERNAL_GIT_ROOT/platform={windows,linux,macos}/artifacts/protoc_* protoc_plugins || true - # Kokoro flow cp -r $EXTERNAL_GIT_ROOT/input_artifacts/protoc_* protoc_plugins || true dotnet restore Grpc.sln |