diff --git a/build/build/Tasks/Test/PublishCoverage.cs b/build/build/Tasks/Test/PublishCoverage.cs index f830e2d914..1273c881da 100644 --- a/build/build/Tasks/Test/PublishCoverage.cs +++ b/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.IsOnMainOrReleaseBranchOriginalRepo, $"{nameof(PublishCoverage)} works only for on main or release branch original repository."); + shouldRun &= context.ShouldRun(context.IsOnMainOrSupportBranchOriginalRepo, $"{nameof(PublishCoverage)} works only for on main or release branch original repository."); return shouldRun; } diff --git a/build/common/Utilities/BuildContextBase.cs b/build/common/Utilities/BuildContextBase.cs index f171c3ff3a..44803d8ad4 100644 --- a/build/common/Utilities/BuildContextBase.cs +++ b/build/common/Utilities/BuildContextBase.cs @@ -9,7 +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 IsSupportBranch { get; set; } public bool IsPullRequest { get; set; } public bool IsTagged { get; set; } public bool IsLocalBuild { get; set; } @@ -18,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 IsOnMainOrReleaseBranchOriginalRepo => !IsLocalBuild && IsOriginalRepo && (IsMainBranch || IsReleaseBranch) && !IsPullRequest; - public bool IsStableRelease => IsOnMainOrReleaseBranchOriginalRepo && IsTagged; - public bool IsPreRelease => IsOnMainOrReleaseBranchOriginalRepo && !IsTagged; + public bool IsOnMainOrSupportBranchOriginalRepo => !IsLocalBuild && IsOriginalRepo && (IsMainBranch || IsSupportBranch) && !IsPullRequest; + public bool IsStableRelease => IsOnMainOrSupportBranchOriginalRepo && IsTagged; + public bool IsPreRelease => IsOnMainOrSupportBranchOriginalRepo && !IsTagged; } diff --git a/build/common/Utilities/BuildLifetimeBase.cs b/build/common/Utilities/BuildLifetimeBase.cs index 79d0314f93..5928c34777 100644 --- a/build/common/Utilities/BuildLifetimeBase.cs +++ b/build/common/Utilities/BuildLifetimeBase.cs @@ -15,7 +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.IsSupportBranch = context.IsSupportBranch(); context.IsTagged = context.IsTagged(); context.IsOnWindows = context.IsRunningOnWindows(); @@ -39,7 +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("Support Branch: {0}", context.IsSupportBranch); context.Information("Tagged: {0}", context.IsTagged); context.Information("Finished running tasks."); @@ -62,7 +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("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 0c19356381..dc7bccda97 100644 --- a/build/common/Utilities/ContextExtensions.cs +++ b/build/common/Utilities/ContextExtensions.cs @@ -80,13 +80,13 @@ public static bool IsMainBranch(this ICakeContext context) return !string.IsNullOrWhiteSpace(repositoryBranch) && StringComparer.OrdinalIgnoreCase.Equals("main", repositoryBranch); } - public static bool IsReleaseBranch(this ICakeContext context) + public static bool IsSupportBranch(this ICakeContext context) { var repositoryBranch = GetBranchName(context); context.Information("Repository Branch: {0}", repositoryBranch); - return !string.IsNullOrWhiteSpace(repositoryBranch) && repositoryBranch.StartsWith("release/", StringComparison.OrdinalIgnoreCase); + return !string.IsNullOrWhiteSpace(repositoryBranch) && repositoryBranch.StartsWith("suppoer/", StringComparison.OrdinalIgnoreCase); } public static bool IsTagged(this ICakeContext context) diff --git a/build/publish/Tasks/PublishNuget.cs b/build/publish/Tasks/PublishNuget.cs index 6a769acffb..25e40afb62 100644 --- a/build/publish/Tasks/PublishNuget.cs +++ b/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.IsOnMainOrReleaseBranchOriginalRepo) + if (context.IsGitHubActionsBuild && context.IsOnMainOrSupportBranchOriginalRepo) { var apiKey = context.Credentials?.GitHub?.Token; if (string.IsNullOrEmpty(apiKey))