From 3a79a495ce81ce0b81187b4f2ddbf13302f1ded0 Mon Sep 17 00:00:00 2001 From: Artur Date: Fri, 11 Mar 2022 18:27:29 +0100 Subject: [PATCH] (build) renamed the release to support branch --- build/common/Utilities/BuildContextBase.cs | 1 + build/common/Utilities/BuildLifetimeBase.cs | 3 +++ build/common/Utilities/ContextExtensions.cs | 11 ++--------- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/build/common/Utilities/BuildContextBase.cs b/build/common/Utilities/BuildContextBase.cs index 44803d8ad4..ff67d773bc 100644 --- a/build/common/Utilities/BuildContextBase.cs +++ b/build/common/Utilities/BuildContextBase.cs @@ -8,6 +8,7 @@ protected BuildContextBase(ICakeContext context) : base(context) public BuildVersion? Version { get; set; } public bool IsOriginalRepo { get; set; } + public string BranchName { get; set; } = string.Empty; public bool IsMainBranch { get; set; } public bool IsSupportBranch { get; set; } public bool IsPullRequest { get; set; } diff --git a/build/common/Utilities/BuildLifetimeBase.cs b/build/common/Utilities/BuildLifetimeBase.cs index 5928c34777..f117462390 100644 --- a/build/common/Utilities/BuildLifetimeBase.cs +++ b/build/common/Utilities/BuildLifetimeBase.cs @@ -13,6 +13,7 @@ public override void Setup(T context) context.IsGitHubActionsBuild = buildSystem.IsRunningOnGitHubActions; context.IsPullRequest = buildSystem.IsPullRequest; + context.BranchName = context.GetBranchName(); context.IsOriginalRepo = context.IsOriginalRepo(); context.IsMainBranch = context.IsMainBranch(); context.IsSupportBranch = context.IsSupportBranch(); @@ -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("Branch Name: {0}", context.BranchName); context.Information("Main Branch: {0}", context.IsMainBranch); context.Information("Support Branch: {0}", context.IsSupportBranch); context.Information("Tagged: {0}", context.IsTagged); @@ -61,6 +63,7 @@ protected void LogBuildInformation(T context) context.Information("OS: {0}", context.GetOS()); context.Information("Pull Request: {0}", context.IsPullRequest); context.Information("Original Repo: {0}", context.IsOriginalRepo); + context.Information("Branch Name: {0}", context.BranchName); context.Information("Main Branch: {0}", context.IsMainBranch); context.Information("Support Branch: {0}", context.IsSupportBranch); context.Information("Tagged: {0}", context.IsTagged); diff --git a/build/common/Utilities/ContextExtensions.cs b/build/common/Utilities/ContextExtensions.cs index dc7bccda97..552f01aa84 100644 --- a/build/common/Utilities/ContextExtensions.cs +++ b/build/common/Utilities/ContextExtensions.cs @@ -74,19 +74,13 @@ public static bool IsOriginalRepo(this ICakeContext context) public static bool IsMainBranch(this ICakeContext context) { var repositoryBranch = GetBranchName(context); - - context.Information("Repository Branch: {0}", repositoryBranch); - return !string.IsNullOrWhiteSpace(repositoryBranch) && StringComparer.OrdinalIgnoreCase.Equals("main", repositoryBranch); } public static bool IsSupportBranch(this ICakeContext context) { var repositoryBranch = GetBranchName(context); - - context.Information("Repository Branch: {0}", repositoryBranch); - - return !string.IsNullOrWhiteSpace(repositoryBranch) && repositoryBranch.StartsWith("suppoer/", StringComparison.OrdinalIgnoreCase); + return !string.IsNullOrWhiteSpace(repositoryBranch) && repositoryBranch.StartsWith("support/", StringComparison.OrdinalIgnoreCase); } public static bool IsTagged(this ICakeContext context) @@ -172,9 +166,8 @@ public static bool ShouldRun(this ICakeContext context, bool criteria, string sk return false; } - private static string GetBranchName(ICakeContext context) + public static string GetBranchName(this ICakeContext context) { - var buildSystem = context.BuildSystem(); string repositoryBranch = context.ExecGitCmd("rev-parse --abbrev-ref HEAD").Single(); if (buildSystem.IsRunningOnAppVeyor)