From 6fd12a076d213255e37c00ca8955baa5f1cb77a1 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Thu, 5 Jul 2018 16:43:26 +0200 Subject: add scripts for automated building of C# nuget on Kokoro --- kokoro/release/csharp/windows/build_nuget.bat | 5 +++++ kokoro/release/csharp/windows/release.cfg | 11 +++++++++++ 2 files changed, 16 insertions(+) create mode 100644 kokoro/release/csharp/windows/build_nuget.bat create mode 100644 kokoro/release/csharp/windows/release.cfg diff --git a/kokoro/release/csharp/windows/build_nuget.bat b/kokoro/release/csharp/windows/build_nuget.bat new file mode 100644 index 00000000..bc15bd57 --- /dev/null +++ b/kokoro/release/csharp/windows/build_nuget.bat @@ -0,0 +1,5 @@ +@rem enter repo root +cd /d %~dp0\..\..\..\.. + +cd csharp\src +call build_packages.bat diff --git a/kokoro/release/csharp/windows/release.cfg b/kokoro/release/csharp/windows/release.cfg new file mode 100644 index 00000000..f508c65b --- /dev/null +++ b/kokoro/release/csharp/windows/release.cfg @@ -0,0 +1,11 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/release/csharp/windows/build_nuget.bat" +timeout_mins: 60 + +action { + define_artifacts { + regex: "**/*.nupkg" + } +} -- cgit v1.2.3 From 9d0b9e4ea01fd1d895e312ee15a01866ad29085d Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Fri, 13 Jul 2018 11:45:28 +0200 Subject: fix build_nuget.bat --- kokoro/release/csharp/windows/build_nuget.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kokoro/release/csharp/windows/build_nuget.bat b/kokoro/release/csharp/windows/build_nuget.bat index bc15bd57..5da1e136 100644 --- a/kokoro/release/csharp/windows/build_nuget.bat +++ b/kokoro/release/csharp/windows/build_nuget.bat @@ -1,5 +1,5 @@ @rem enter repo root cd /d %~dp0\..\..\..\.. -cd csharp\src +cd csharp call build_packages.bat -- cgit v1.2.3 From 937884476e8a5873af4e2a44762ed76865ffd877 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Fri, 13 Jul 2018 13:26:56 +0200 Subject: overcome the global.json constraint with a hack --- kokoro/release/csharp/windows/build_nuget.bat | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/kokoro/release/csharp/windows/build_nuget.bat b/kokoro/release/csharp/windows/build_nuget.bat index 5da1e136..7552bec3 100644 --- a/kokoro/release/csharp/windows/build_nuget.bat +++ b/kokoro/release/csharp/windows/build_nuget.bat @@ -2,4 +2,13 @@ cd /d %~dp0\..\..\..\.. cd csharp + +@rem see what dotnet version is available +dotnet --version + +@rem TODO(jtattermusch): Kokoro workers currently only have dotnet SDK 2.1.3 +@rem so we just overwrite the SDK requirement in global.json as the results +@rem should be fully compatible. +echo { "sdk": { "version": "2.1.3" } } >global.json + call build_packages.bat -- cgit v1.2.3 From 2f6443edcc86f5f3465bf37f5a5f9348d513f0c4 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 16 Jul 2018 19:17:42 +0200 Subject: use SDK version available on Kokoro --- csharp/global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/csharp/global.json b/csharp/global.json index 5ab775b9..080dcb94 100644 --- a/csharp/global.json +++ b/csharp/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "2.0.3" + "version": "2.1.3" } } -- cgit v1.2.3 From d754a0c478db3632d1dd490f62f33542c554fe5f Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 16 Jul 2018 19:19:02 +0200 Subject: Revert "overcome the global.json constraint with a hack" This reverts commit c02346c72aafd1826b0397dbbce4ce04bf252f50. --- kokoro/release/csharp/windows/build_nuget.bat | 9 --------- 1 file changed, 9 deletions(-) diff --git a/kokoro/release/csharp/windows/build_nuget.bat b/kokoro/release/csharp/windows/build_nuget.bat index 7552bec3..5da1e136 100644 --- a/kokoro/release/csharp/windows/build_nuget.bat +++ b/kokoro/release/csharp/windows/build_nuget.bat @@ -2,13 +2,4 @@ cd /d %~dp0\..\..\..\.. cd csharp - -@rem see what dotnet version is available -dotnet --version - -@rem TODO(jtattermusch): Kokoro workers currently only have dotnet SDK 2.1.3 -@rem so we just overwrite the SDK requirement in global.json as the results -@rem should be fully compatible. -echo { "sdk": { "version": "2.1.3" } } >global.json - call build_packages.bat -- cgit v1.2.3 From 149e31a6c046236c2d7d2fc8e2997270ae10fc3d Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 17 Jul 2018 10:21:29 +0200 Subject: upgrade dotnet SDK to 2.1.3 on kokoro linux --- kokoro/linux/prepare_build_linux_rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kokoro/linux/prepare_build_linux_rc b/kokoro/linux/prepare_build_linux_rc index f64ea952..d9b3bec3 100644 --- a/kokoro/linux/prepare_build_linux_rc +++ b/kokoro/linux/prepare_build_linux_rc @@ -7,7 +7,7 @@ sudo sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsof sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys EB3E94ADBE1229CF sudo apt-get update # We use the .NET Core SDK 2.x to build... -sudo apt-get install -y dotnet-sdk-2.0.3 +sudo apt-get install -y dotnet-sdk-2.1.3 # But we also need the 1.x framework to test against, as we # target netstandard1.x sudo apt-get install -y dotnet-sharedframework-microsoft.netcore.app-1.0.5 -- cgit v1.2.3