(build) fixes to allow building from release branch

Author: arturcic

build/build/Tasks/Test/PublishCoverage.cs

@@ -12,7 +12,7 @@ public override bool ShouldRun(BuildContext context)
     {
         var shouldRun = true;
         shouldRun &= context.ShouldRun(context.IsOnWindows, $"{nameof(PublishCoverage)} works only on Windows agents.");
-        shouldRun &= context.ShouldRun(context.IsOnMainBranchOriginalRepo, $"{nameof(PublishCoverage)} works only for on main branch original repository.");
+        shouldRun &= context.ShouldRun(context.IsOnMainOrReleaseBranchOriginalRepo, $"{nameof(PublishCoverage)} works only for on main or release branch original repository.");
 
         return shouldRun;
     }

build/common/Utilities/BuildContextBase.cs

@@ -9,6 +9,7 @@ protected BuildContextBase(ICakeContext context) : base(context)
 
     public bool IsOriginalRepo { get; set; }
     public bool IsMainBranch { get; set; }
+    public bool IsReleaseBranch { get; set; }
     public bool IsPullRequest { get; set; }
     public bool IsTagged { get; set; }
     public bool IsLocalBuild { get; set; }
@@ -17,7 +18,7 @@ protected BuildContextBase(ICakeContext context) : base(context)
     public bool IsOnWindows { get; set; }
     public bool IsOnLinux { get; set; }
     public bool IsOnMacOS { get; set; }
-    public bool IsOnMainBranchOriginalRepo => !IsLocalBuild && IsOriginalRepo && IsMainBranch && !IsPullRequest;
-    public bool IsStableRelease => IsOnMainBranchOriginalRepo && IsTagged;
-    public bool IsPreRelease => IsOnMainBranchOriginalRepo && !IsTagged;
+    public bool IsOnMainOrReleaseBranchOriginalRepo => !IsLocalBuild && IsOriginalRepo && (IsMainBranch || IsReleaseBranch) && !IsPullRequest;
+    public bool IsStableRelease => IsOnMainOrReleaseBranchOriginalRepo && IsTagged;
+    public bool IsPreRelease => IsOnMainOrReleaseBranchOriginalRepo && !IsTagged;
 }

build/common/Utilities/BuildLifetimeBase.cs

@@ -15,6 +15,7 @@ public override void Setup(T context)
         context.IsPullRequest = buildSystem.IsPullRequest;
         context.IsOriginalRepo = context.IsOriginalRepo();
         context.IsMainBranch = context.IsMainBranch();
+        context.IsReleaseBranch = context.IsReleaseBranch();
         context.IsTagged = context.IsTagged();
 
         context.IsOnWindows = context.IsRunningOnWindows();
@@ -38,6 +39,7 @@ public override void Teardown(T context, ITeardownContext info)
             context.Information("Pull Request:      {0}", context.IsPullRequest);
             context.Information("Original Repo:     {0}", context.IsOriginalRepo);
             context.Information("Main Branch:       {0}", context.IsMainBranch);
+            context.Information("Release Branch:    {0}", context.IsReleaseBranch);
             context.Information("Tagged:            {0}", context.IsTagged);
 
             context.Information("Finished running tasks.");
@@ -60,6 +62,7 @@ protected void LogBuildInformation(T context)
         context.Information("Pull Request:      {0}", context.IsPullRequest);
         context.Information("Original Repo:     {0}", context.IsOriginalRepo);
         context.Information("Main Branch:       {0}", context.IsMainBranch);
+        context.Information("Release Branch:    {0}", context.IsReleaseBranch);
         context.Information("Tagged:            {0}", context.IsTagged);
     }
 }

build/common/Utilities/ContextExtensions.cs

@@ -73,26 +73,22 @@ public static bool IsOriginalRepo(this ICakeContext context)
 
     public static bool IsMainBranch(this ICakeContext context)
     {
-        var buildSystem = context.BuildSystem();
-        string repositoryBranch = context.ExecGitCmd("rev-parse --abbrev-ref HEAD").Single();
-        if (buildSystem.IsRunningOnAppVeyor)
-        {
-            repositoryBranch = buildSystem.AppVeyor.Environment.Repository.Branch;
-        }
-        else if (buildSystem.IsRunningOnAzurePipelines)
-        {
-            repositoryBranch = buildSystem.AzurePipelines.Environment.Repository.SourceBranchName;
-        }
-        else if (buildSystem.IsRunningOnGitHubActions)
-        {
-            repositoryBranch = buildSystem.GitHubActions.Environment.Workflow.Ref.Replace("refs/heads/", "");
-        }
+        var repositoryBranch = GetBranchName(context);
 
         context.Information("Repository Branch: {0}", repositoryBranch);
 
         return !string.IsNullOrWhiteSpace(repositoryBranch) && StringComparer.OrdinalIgnoreCase.Equals("main", repositoryBranch);
     }
 
+    public static bool IsReleaseBranch(this ICakeContext context)
+    {
+        var repositoryBranch = GetBranchName(context);
+
+        context.Information("Repository Branch: {0}", repositoryBranch);
+
+        return !string.IsNullOrWhiteSpace(repositoryBranch) && repositoryBranch.StartsWith("release/", StringComparison.OrdinalIgnoreCase);
+    }
+
     public static bool IsTagged(this ICakeContext context)
     {
         var sha = context.ExecGitCmd("rev-parse --verify HEAD").Single();
@@ -122,6 +118,7 @@ public static string GetOS(this ICakeContext context)
         if (context.IsRunningOnWindows()) return "Windows";
         if (context.IsRunningOnLinux()) return "Linux";
         if (context.IsRunningOnMacOs()) return "macOs";
+
         return string.Empty;
     }
 
@@ -174,4 +171,24 @@ public static bool ShouldRun(this ICakeContext context, bool criteria, string sk
         context.Information(skipMessage);
         return false;
     }
+
+    private static string GetBranchName(ICakeContext context)
+    {
+
+        var buildSystem = context.BuildSystem();
+        string repositoryBranch = context.ExecGitCmd("rev-parse --abbrev-ref HEAD").Single();
+        if (buildSystem.IsRunningOnAppVeyor)
+        {
+            repositoryBranch = buildSystem.AppVeyor.Environment.Repository.Branch;
+        }
+        else if (buildSystem.IsRunningOnAzurePipelines)
+        {
+            repositoryBranch = buildSystem.AzurePipelines.Environment.Repository.SourceBranchName;
+        }
+        else if (buildSystem.IsRunningOnGitHubActions)
+        {
+            repositoryBranch = buildSystem.GitHubActions.Environment.Workflow.Ref.Replace("refs/heads/", "");
+        }
+        return repositoryBranch;
+    }
 }

build/publish/Tasks/PublishNuget.cs

@@ -26,7 +26,7 @@ public override bool ShouldRun(BuildContext context)
     public override void Run(BuildContext context)
     {
         // publish to github packages for commits on main and on original repo
-        if (context.IsGitHubActionsBuild && context.IsOnMainBranchOriginalRepo)
+        if (context.IsGitHubActionsBuild && context.IsOnMainOrReleaseBranchOriginalRepo)
         {
             var apiKey = context.Credentials?.GitHub?.Token;
             if (string.IsNullOrEmpty(apiKey))

src/GitVersion.Core.Tests/Extensions/StringFormatWithExtensionTests.cs

@@ -16,9 +16,8 @@ public class StringFormatWithExtensionTests
     public void FormatWithNoTokens()
     {
         var propertyObject = new { };
-        const string target = "Some String without tokens";
-        var expected = target;
-        var actual = target.FormatWith(propertyObject, this.environment);
+        const string expected = "Some String without tokens";
+        var actual = expected.FormatWith(propertyObject, this.environment);
         Assert.AreEqual(expected, actual);
     }