From 8eae94cd4335f7559f71615db51893e9e79af471 Mon Sep 17 00:00:00 2001 From: Elmer Thomas Date: Thu, 16 Jan 2020 12:31:48 -0800 Subject: [PATCH 1/3] chore: prep the repo for automated releasing --- .travis.yml | 9 +-------- CHANGELOG.md | 3 ++- LICENSE.md | 2 +- Makefile | 15 +++++++++++++++ 4 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 Makefile diff --git a/.travis.yml b/.travis.yml index 8daef51..a738cfb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,15 +3,8 @@ solution: CSharpHTTPClient/CSharpHTTPClient.sln env: matrix: secure: KJrQ+NfmzlgCSXRyqeAMDGZUG6GO4/+xk1T0wGy1BgVz8seo/fDWL8osWEljB4Sj05sfFj7CM+rociwL6sdVyqCiHbCAM7XuHs58D+4Tlh5pGHL+G1qOl65/pDl0ulq+M7PwDxHPZ60/oyH2a16t5jtD9e4W31y2fXzEbHGLHXg= -install: -- nuget restore CSharpHTTPClient/CSharpHTTPClient.sln -- nuget install NUnit.Runners -Version 2.6.4 -OutputDirectory testrunner script: -- xbuild /p:Configuration=Release CSharpHTTPClient/CSharpHTTPClient.sln -- mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe UnitTest/bin/Release/UnitTest.dll -domain:None -- curl -s https://codecov.io/bash > .codecov -- chmod +x .codecov -- ./.codecov + - make release deploy: skip_cleanup: true provider: script diff --git a/CHANGELOG.md b/CHANGELOG.md index 0776e51..225148b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,8 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [3.4.1] - 2019-08-14 +[2019-08-14] Version 3.4.1 +-------------------------- ### Added - [PR #90](https://github.com/sendgrid/csharp-http-client/pull/90): Twilio branding updates. diff --git a/LICENSE.md b/LICENSE.md index 2bb37c2..bdcfbf2 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2012-2019 Twilio SendGrid, Inc. +Copyright (c) 2012-2020 Twilio SendGrid, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..cf8b33b --- /dev/null +++ b/Makefile @@ -0,0 +1,15 @@ +.PHONY: test install release + +install: + nuget restore CSharpHTTPClient/CSharpHTTPClient.sln + nuget install NUnit.Runners -Version 2.6.4 -OutputDirectory testrunner + +test: install + xbuild /p:Configuration=Release CSharpHTTPClient/CSharpHTTPClient.sln + mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe UnitTest/bin/Release/UnitTest.dll -domain:None + curl -s https://codecov.io/bash > .codecov + chmod +x .codecov + ./.codecov + +release: test + dotnet pack ./src/CSharpHTTPClient -c Release From 1ea720a4d2bf8d693b36bc761a5ea68885f0d20f Mon Sep 17 00:00:00 2001 From: Elmer Thomas Date: Thu, 16 Jan 2020 13:27:05 -0800 Subject: [PATCH 2/3] wrong build command --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index cf8b33b..7ce39f2 100644 --- a/Makefile +++ b/Makefile @@ -5,11 +5,10 @@ install: nuget install NUnit.Runners -Version 2.6.4 -OutputDirectory testrunner test: install - xbuild /p:Configuration=Release CSharpHTTPClient/CSharpHTTPClient.sln mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe UnitTest/bin/Release/UnitTest.dll -domain:None curl -s https://codecov.io/bash > .codecov chmod +x .codecov ./.codecov release: test - dotnet pack ./src/CSharpHTTPClient -c Release + xbuild /p:Configuration=Release CSharpHTTPClient/CSharpHTTPClient.sln From 5db6c30f9a83af19d40994719eb139b6a7fba890 Mon Sep 17 00:00:00 2001 From: Elmer Thomas Date: Thu, 16 Jan 2020 13:40:00 -0800 Subject: [PATCH 3/3] Wrestling with travis --- .travis.yml | 2 +- Makefile | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a738cfb..e65b760 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ env: matrix: secure: KJrQ+NfmzlgCSXRyqeAMDGZUG6GO4/+xk1T0wGy1BgVz8seo/fDWL8osWEljB4Sj05sfFj7CM+rociwL6sdVyqCiHbCAM7XuHs58D+4Tlh5pGHL+G1qOl65/pDl0ulq+M7PwDxHPZ60/oyH2a16t5jtD9e4W31y2fXzEbHGLHXg= script: - - make release + - make test deploy: skip_cleanup: true provider: script diff --git a/Makefile b/Makefile index 7ce39f2..b1e9484 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,13 @@ -.PHONY: test install release +.PHONY: test install install: nuget restore CSharpHTTPClient/CSharpHTTPClient.sln nuget install NUnit.Runners -Version 2.6.4 -OutputDirectory testrunner test: install + xbuild /p:Configuration=Release CSharpHTTPClient/CSharpHTTPClient.sln mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe UnitTest/bin/Release/UnitTest.dll -domain:None curl -s https://codecov.io/bash > .codecov chmod +x .codecov ./.codecov -release: test - xbuild /p:Configuration=Release CSharpHTTPClient/CSharpHTTPClient.sln