From 4e7e8c384ef717df43a226e4ac72f406393bde1b Mon Sep 17 00:00:00 2001 From: Henrik Andersson Date: Tue, 10 Mar 2020 17:35:05 +1000 Subject: [PATCH 1/5] Update and pin gitversion to 5.2.0 --- build.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.cake b/build.cake index 731d56bd3..8cd5bf4a0 100644 --- a/build.cake +++ b/build.cake @@ -1,7 +1,7 @@ ////////////////////////////////////////////////////////////////////// // TOOLS ////////////////////////////////////////////////////////////////////// -#tool "nuget:?package=GitVersion.CommandLine&version=4.0.0-beta0012" +#tool "nuget:?package=GitVersion.CommandLine&version=5.2.0" #addin "nuget:?package=Cake.Incubator&version=5.0.1" using Path = System.IO.Path; From a857d9db681a839a3612734e62c7f7fd69c069d3 Mon Sep 17 00:00:00 2001 From: Henrik Andersson Date: Tue, 10 Mar 2020 17:35:34 +1000 Subject: [PATCH 2/5] Update cake version --- tools/packages.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/packages.config b/tools/packages.config index d65460293..14aef3bf0 100644 --- a/tools/packages.config +++ b/tools/packages.config @@ -1,4 +1,4 @@ - + From 96a047ed5a98ec03ed88a7a5243adffaefb47a22 Mon Sep 17 00:00:00 2001 From: Henrik Andersson Date: Tue, 10 Mar 2020 17:36:34 +1000 Subject: [PATCH 3/5] Don't sign binaries if we're building locally to reduce the build time --- build.cake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.cake b/build.cake index 8cd5bf4a0..d8cff4386 100644 --- a/build.cake +++ b/build.cake @@ -243,6 +243,8 @@ private void DoPackage(string project, string framework, string version, string private void SignAndTimestampBinaries(string outputDirectory) { + if (BuildSystem.IsLocalBuild) return; + Information($"Signing binaries in {outputDirectory}"); // check that any unsigned libraries, that Octopus Deploy authors, get signed to play nice with security scanning tools From db450b858bc96b612974ff78bf7959ec29e2ac16 Mon Sep 17 00:00:00 2001 From: Henrik Andersson Date: Tue, 10 Mar 2020 17:39:46 +1000 Subject: [PATCH 4/5] We don't want release branches to take precedence over tags when merged to master when calculating versions --- GitVersion.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/GitVersion.yml b/GitVersion.yml index 648057e0e..85a4ec875 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,4 +1,7 @@ mode: ContinuousDeployment +branches: + release: + is-release-branch: false ignore: sha: [ e823e5382ae16d433cbfda913f593f92aaaa462f, From 7f6c04deb38343441a93131ca2353393b35929e2 Mon Sep 17 00:00:00 2001 From: Henrik Andersson Date: Wed, 11 Mar 2020 08:17:24 +1000 Subject: [PATCH 5/5] Add comment about why we don't sign our binaries when building locally --- build.cake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.cake b/build.cake index d8cff4386..8fd5655f9 100644 --- a/build.cake +++ b/build.cake @@ -243,8 +243,10 @@ private void DoPackage(string project, string framework, string version, string private void SignAndTimestampBinaries(string outputDirectory) { + // When building locally signing isn't really necessary and it could take up to 3-4 minutes to sign all the binaries + // as we build for many, many different runtimes so disabling it locally means quicker turn around when doing local development. if (BuildSystem.IsLocalBuild) return; - + Information($"Signing binaries in {outputDirectory}"); // check that any unsigned libraries, that Octopus Deploy authors, get signed to play nice with security scanning tools