Merge branch 'release/1.2.0'

Author: candoumbe

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.2.0] / 2025-09-09
+### 🚀 New features
+- Added `IDoChoreWorkflow` component that can be used to work on a task using a `chore/*` branch.
+
 ## [1.1.0] / 2025-09-09
 ### 🚀 New features
 - Improved targets ordering
@@ -287,7 +291,8 @@ So now `{MutationTestDirectory}/[{framework}]` is now changed to `{MutationTestD
 ## [0.1.0] / 2022-10-23
 - Initial release
 
-[Unreleased]: https://github.com/candoumbe/Pipelines/compare/1.1.0...HEAD
+[Unreleased]: https://github.com/candoumbe/Pipelines/compare/1.2.0...HEAD
+[1.2.0]: https://github.com/candoumbe/Pipelines/compare/1.1.0...1.2.0
 [1.1.0]: https://github.com/candoumbe/Pipelines/compare/1.0.1...1.1.0
 [1.0.1]: https://github.com/candoumbe/Pipelines/compare/1.0.0...1.0.1
 [1.0.0]: https://github.com/candoumbe/Pipelines/compare/0.13.4...1.0.0

GitVersion.yml

@@ -12,6 +12,18 @@ branches:
         tracks-release-branches: false
         is-release-branch: false
         pre-release-weight: 30000
+    chore:
+      regex: "^chore(s)?[/-](?<BranchName>.+)"
+      mode: ContinuousDelivery
+      label: '{BranchName}'
+      increment: None
+      prevent-increment:
+        of-merged-branch: false
+      track-merge-target: false
+      source-branches: [ 'develop', 'feature', 'support', 'hotfix' ]
+      tracks-release-branches: false
+      is-release-branch: false
+      pre-release-weight: 30000
     coldfix:
         regex: "^coldfix(es)?[/-](?<BranchName>.+)"
         mode: ContinuousDelivery

src/Candoumbe.Pipelines/Components/GitHub/IGitFlowWithPullRequest.cs

@@ -48,7 +48,7 @@ async ValueTask IDoFeatureWorkflow.FinishFeature()
             string token = GitHubToken;
             if (!SkipConfirmation)
             {
-                title = (Console.ReadLine()) switch
+                title = Console.ReadLine() switch
                 {
                     { } value when !string.IsNullOrWhiteSpace(value) => value.Trim(),
                     _ => Title
@@ -108,7 +108,7 @@ static void DeleteLocalBranchIf(in bool condition, in string branchName, in stri
                 (key: ConsoleKey.Y, "Delete the local branch"),
                 (key: ConsoleKey.N, "Keep the local branch"),
             };
-            
+
             static void GitPushToRemote()
             {
                 Git($"push origin --set-upstream {GitCurrentBranch()}");
@@ -143,4 +143,4 @@ static void OpenUrl(string url)
                 }
             }
         }
-}
+}

src/Candoumbe.Pipelines/Components/Workflows/IDoChoreWorkflow.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Threading.Tasks;
+using Nuke.Common;
+using Nuke.Common.Git;
+using static Nuke.Common.Tools.Git.GitTasks;
+using static Serilog.Log;
+
+namespace Candoumbe.Pipelines.Components.Workflows;
+
+/// <summary>
+/// Represents an interface for chore branch workflows in a Git repository.
+/// </summary>
+/// <remarks>
+/// This interface extends the <see cref="IWorkflow"/> interface and adds properties and methods specific to feature branch workflows.
+/// </remarks>
+public interface IDoChoreWorkflow : IDoFeatureWorkflow
+{
+    /// <summary>
+    /// Gets the prefix used to name feature branches.
+    /// </summary>
+    [Parameter("The name of the chore branch prefix")]
+    public string ChoreBranchPrefix => TryGetValue(() => ChoreBranchPrefix) ?? "chore";
+
+    /// <summary>
+    /// Gets the name of the branch to use when starting a new feature.
+    /// </summary>
+    /// <remarks>
+    /// This property should never return <see langword="null"/>.
+    /// </remarks>
+    [Parameter("The name of the chore branch source")]
+    string ChoreBranchSourceName => TryGetValue(() => ChoreBranchPrefix) ?? FeatureBranchSourceName;
+
+    /// <summary>
+    /// Merges a chore branch back to <see cref="ChoreBranchSourceName"/>.
+    /// </summary>
+    /// <returns>A <see cref="ValueTask"/> representing the asynchronous operation.</returns>
+    ValueTask FinishChore() => ValueTask.CompletedTask;
+
+    /// <summary>
+    /// Starts a new chore development by creating the associated branch {FeatureBranchPrefix}/{{feature-name}} from {FeatureBranchSourceName}.
+    /// </summary>
+    /// <remarks>
+    /// This target will instead end a feature if the current branch is a feature/* branch with no pending changes.
+    /// </remarks>
+    /// <returns>A <see cref="Target"/> representing the feature development.</returns>
+    public Target Chore => _ => _
+       .Description($"Starts a new chore development by creating the associated branch {ChoreBranchPrefix}/{{chore-name}} from {ChoreBranchSourceName}")
+       .Requires(() => IsLocalBuild)
+       .Requires(() => !GitRepository.IsOnFeatureBranch() || GitHasCleanWorkingCopy())
+       .Executes(async () =>
+       {
+           if (!GitRepository.Branch.Like($"{ChoreBranchPrefix}/*", true) || !GitHasCleanWorkingCopy())
+           {
+               Information("Enter the name of the chore. It will be used as the name of the chore/branch (leave empty to exit) :");
+               AskBranchNameAndSwitchToIt(ChoreBranchPrefix, sourceBranch: ChoreBranchSourceName);
+               Information("Good bye !");
+           }
+           else
+           {
+               await FinishChore();
+           }
+       });
+}