Skip to content

Commit

Permalink
Merge pull request #526 from OctopusDeploy/henrik/gitversiontweaks
Browse files Browse the repository at this point in the history
Tweak gitversion to respect our tags on master when calculating versions
  • Loading branch information
hnrkndrssn authored Mar 11, 2020
2 parents 8441c1c + 7f6c04d commit bc97840
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
3 changes: 3 additions & 0 deletions GitVersion.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
mode: ContinuousDeployment
branches:
release:
is-release-branch: false
ignore:
sha: [
e823e5382ae16d433cbfda913f593f92aaaa462f,
Expand Down
6 changes: 5 additions & 1 deletion build.cake
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -243,6 +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
Expand Down
2 changes: 1 addition & 1 deletion tools/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Cake" version="0.24.0" />
<package id="Cake" version="0.36.0" />
</packages>

0 comments on commit bc97840

Please sign in to comment.