Integrate code review suggestions.

GitTools · Jan 26, 2024 · 75f5dc0 · 75f5dc0
1 parent e19c90a
commit 75f5dc0
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 94 deletions.
diff --git a/docs/input/docs/reference/configuration.md b/docs/input/docs/reference/configuration.md
@@ -61,20 +61,22 @@ strategies:
 - VersionInBranchName
 branches:
   develop:
-    mode: ContinuousDelivery
+    tracks-release-branches: true
+    is-release-branch: false
+    is-main-branch: false
+    pre-release-weight: 0
     label: alpha
     increment: Minor
     prevent-increment-of-merged-branch-version: false
     track-merge-target: true
     regex: ^dev(elop)?(ment)?$
     source-branches: []
     is-source-branch-for: []
-    tracks-release-branches: true
-    is-release-branch: false
-    is-main-branch: false
-    pre-release-weight: 0
   main:
-    mode: ContinuousDeployment
+    tracks-release-branches: false
+    is-release-branch: false
+    is-main-branch: true
+    pre-release-weight: 55000
     label: ''
     increment: Patch
     prevent-increment-of-merged-branch-version: true
@@ -84,11 +86,12 @@ branches:
     - develop
     - release
     is-source-branch-for: []
-    tracks-release-branches: false
-    is-release-branch: false
-    is-main-branch: true
-    pre-release-weight: 55000
   release:
+    tracks-release-branches: false
+    is-release-branch: true
+    is-main-branch: false
+    pre-release-weight: 30000
+    mode: ManualDeployment
     label: beta
     increment: None
     prevent-increment-of-merged-branch-version: true
@@ -100,11 +103,8 @@ branches:
     - support
     - release
     is-source-branch-for: []
-    tracks-release-branches: false
-    is-release-branch: true
-    is-main-branch: false
-    pre-release-weight: 30000
   feature:
+    pre-release-weight: 30000
     mode: ManualDeployment
     label: '{BranchName}'
     increment: Inherit
@@ -117,8 +117,8 @@ branches:
     - support
     - hotfix
     is-source-branch-for: []
-    pre-release-weight: 30000
   pull-request:
+    pre-release-weight: 30000
     mode: ContinuousDelivery
     label: PullRequest
     increment: Inherit
@@ -132,8 +132,9 @@ branches:
     - support
     - hotfix
     is-source-branch-for: []
-    pre-release-weight: 30000
   hotfix:
+    is-release-branch: true
+    pre-release-weight: 30000
     mode: ManualDeployment
     label: beta
     increment: Inherit
@@ -144,9 +145,11 @@ branches:
     - support
     - hotfix
     is-source-branch-for: []
-    is-release-branch: true
-    pre-release-weight: 30000
   support:
+    tracks-release-branches: false
+    is-release-branch: false
+    is-main-branch: true
+    pre-release-weight: 55000
     label: ''
     increment: Patch
     prevent-increment-of-merged-branch-version: true
@@ -155,10 +158,6 @@ branches:
     source-branches:
     - main
     is-source-branch-for: []
-    tracks-release-branches: false
-    is-release-branch: false
-    is-main-branch: true
-    pre-release-weight: 55000
   unknown:
     mode: ManualDeployment
     label: '{BranchName}'
@@ -175,7 +174,7 @@ branches:
     is-source-branch-for: []
 ignore:
   sha: []
-mode: ManualDeployment
+mode: ContinuousDelivery
 label: '{BranchName}'
 increment: Inherit
 prevent-increment-of-merged-branch-version: false
@@ -188,7 +187,6 @@ is-source-branch-for: []
 tracks-release-branches: false
 is-release-branch: false
 is-main-branch: false
-
 ```
 
 The details of the available options are as follows:

diff --git a/...s/Configuration/ConfigurationProviderTests.CanWriteOutEffectiveConfiguration.approved.txt b/...s/Configuration/ConfigurationProviderTests.CanWriteOutEffectiveConfiguration.approved.txt
@@ -19,20 +19,22 @@ strategies:
 - VersionInBranchName
 branches:
   develop:
-    mode: ContinuousDelivery
+    tracks-release-branches: true
+    is-release-branch: false
+    is-main-branch: false
+    pre-release-weight: 0
     label: alpha
     increment: Minor
     prevent-increment-of-merged-branch-version: false
     track-merge-target: true
     regex: ^dev(elop)?(ment)?$
     source-branches: []
     is-source-branch-for: []
-    tracks-release-branches: true
-    is-release-branch: false
-    is-main-branch: false
-    pre-release-weight: 0
   main:
-    mode: ContinuousDelivery
+    tracks-release-branches: false
+    is-release-branch: false
+    is-main-branch: true
+    pre-release-weight: 55000
     label: ''
     increment: Patch
     prevent-increment-of-merged-branch-version: true
@@ -42,11 +44,12 @@ branches:
     - develop
     - release
     is-source-branch-for: []
-    tracks-release-branches: false
-    is-release-branch: false
-    is-main-branch: true
-    pre-release-weight: 55000
   release:
+    tracks-release-branches: false
+    is-release-branch: true
+    is-main-branch: false
+    pre-release-weight: 30000
+    mode: ManualDeployment
     label: beta
     increment: None
     prevent-increment-of-merged-branch-version: true
@@ -58,11 +61,8 @@ branches:
     - support
     - release
     is-source-branch-for: []
-    tracks-release-branches: false
-    is-release-branch: true
-    is-main-branch: false
-    pre-release-weight: 30000
   feature:
+    pre-release-weight: 30000
     mode: ManualDeployment
     label: '{BranchName}'
     increment: Inherit
@@ -75,8 +75,8 @@ branches:
     - support
     - hotfix
     is-source-branch-for: []
-    pre-release-weight: 30000
   pull-request:
+    pre-release-weight: 30000
     mode: ContinuousDelivery
     label: PullRequest
     increment: Inherit
@@ -90,8 +90,9 @@ branches:
     - support
     - hotfix
     is-source-branch-for: []
-    pre-release-weight: 30000
   hotfix:
+    is-release-branch: true
+    pre-release-weight: 30000
     mode: ManualDeployment
     label: beta
     increment: Inherit
@@ -102,10 +103,11 @@ branches:
     - support
     - hotfix
     is-source-branch-for: []
-    is-release-branch: true
-    pre-release-weight: 30000
   support:
-    mode: ContinuousDelivery
+    tracks-release-branches: false
+    is-release-branch: false
+    is-main-branch: true
+    pre-release-weight: 55000
     label: ''
     increment: Patch
     prevent-increment-of-merged-branch-version: true
@@ -114,10 +116,6 @@ branches:
     source-branches:
     - main
     is-source-branch-for: []
-    tracks-release-branches: false
-    is-release-branch: false
-    is-main-branch: true
-    pre-release-weight: 55000
   unknown:
     mode: ManualDeployment
     label: '{BranchName}'
@@ -134,7 +132,7 @@ branches:
     is-source-branch-for: []
 ignore:
   sha: []
-mode: ManualDeployment
+mode: ContinuousDelivery
 label: '{BranchName}'
 increment: Inherit
 prevent-increment-of-merged-branch-version: false

diff --git a/src/GitVersion.Configuration/ConfigurationBuilderBase.cs b/src/GitVersion.Configuration/ConfigurationBuilderBase.cs
@@ -24,7 +24,7 @@ internal abstract class ConfigurationBuilderBase<TConfigurationBuilder> : IConfi
     private string? commitDateFormat;
     private bool updateBuildNumber;
     private SemanticVersionFormat semanticVersionFormat;
-    private VersionStrategies[] versionStrategies;
+    private VersionStrategies versionStrategy;
     private Dictionary<string, string> mergeMessageFormats = new();
     private readonly List<IReadOnlyDictionary<object, object?>> overrides = new();
     private readonly Dictionary<string, BranchConfigurationBuilder> branchConfigurationBuilders = new();
@@ -200,20 +200,9 @@ public virtual TConfigurationBuilder WithSemanticVersionFormat(SemanticVersionFo
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithVersionStrategies(params VersionStrategies[] values)
-        => WithVersionStrategies((IEnumerable<VersionStrategies>)values);
-
-    public virtual TConfigurationBuilder WithVersionStrategies(IEnumerable<VersionStrategies> values)
+    public virtual TConfigurationBuilder WithVersionStrategy(VersionStrategies value)
     {
-        HashSet<VersionStrategies> versionStrategies = new();
-        foreach (var versionStrategy in values)
-        {
-            versionStrategies.AddRange(
-                Enum.GetValues<VersionStrategies>().Where(
-                    element => element != VersionStrategies.None && versionStrategy.HasFlag(element))
-            );
-        }
-        this.versionStrategies = versionStrategies.ToArray();
+        this.versionStrategy = value;
         return (TConfigurationBuilder)this;
     }
 
@@ -339,7 +328,7 @@ public virtual TConfigurationBuilder WithConfiguration(IGitVersionConfiguration
         WithCommitDateFormat(value.CommitDateFormat);
         WithUpdateBuildNumber(value.UpdateBuildNumber);
         WithSemanticVersionFormat(value.SemanticVersionFormat);
-        WithVersionStrategies(value.VersionStrategy);
+        WithVersionStrategy(value.VersionStrategy);
         WithMergeMessageFormats(value.MergeMessageFormats);
         foreach (var (name, branchConfiguration) in value.Branches)
         {
@@ -377,6 +366,10 @@ public virtual IGitVersionConfiguration Build()
             branches.Add(name, (BranchConfiguration)branchConfigurationBuilder.Build());
         }
 
+        var versionStrategies = Enum.GetValues<VersionStrategies>()
+            .Where(element => element != VersionStrategies.None && this.versionStrategy.HasFlag(element))
+            .ToArray();
+
         IGitVersionConfiguration configuration = new GitVersionConfiguration
         {
             AssemblyVersioningScheme = this.assemblyVersioningScheme,
@@ -396,7 +389,7 @@ public virtual IGitVersionConfiguration Build()
             CommitDateFormat = this.commitDateFormat,
             UpdateBuildNumber = this.updateBuildNumber,
             SemanticVersionFormat = this.semanticVersionFormat,
-            VersionStrategies = this.versionStrategies,
+            VersionStrategies = versionStrategies,
             Branches = branches,
             MergeMessageFormats = this.mergeMessageFormats,
             DeploymentMode = this.versioningMode,

diff --git a/src/GitVersion.Configuration/SupportedWorkflows/TrunkBased/v1.yml b/src/GitVersion.Configuration/SupportedWorkflows/TrunkBased/v1.yml
@@ -10,57 +10,43 @@ commit-date-format: yyyy-MM-dd
 merge-message-formats: {}
 update-build-number: true
 semantic-version-format: Strict
-strategies: [TrunkBased]
+strategies: [TrunkBased, ConfigNextVersion]
 branches:
   main:
+    mode: ContinuousDeployment
     label: ''
     increment: Patch
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
     regex: ^master$|^main$
-    source-branches:
-    - release
+    source-branches: []
     tracks-release-branches: false
     is-release-branch: false
     is-main-branch: true
     pre-release-weight: 55000
-  release:
-    label: beta
-    increment: None
-    prevent-increment-of-merged-branch-version: true
-    track-merge-target: false
-    regex: ^releases?[/-]
+  feature:
+    increment: Minor
+    regex: ^features?[/-](?<BranchName>.+)
     source-branches:
     - main
-    - release
-    tracks-release-branches: false
-    is-release-branch: true
-    is-main-branch: false
     pre-release-weight: 30000
-  feature:
-    mode: ContinuousDelivery
-    label: '{BranchName}'
-    increment: Inherit
-    regex: ^features?[/-](?<BranchName>.+)
+  hotfix:
+    increment: Patch
+    regex: ^hotfix(es)?[/-](?<BranchName>.+)
     source-branches:
     - main
-    - release
-    - feature
     pre-release-weight: 30000
   pull-request:
-    mode: ContinuousDelivery
+    mode: ManualDeployment
     label: PullRequest
     increment: Inherit
     label-number-pattern: '[/-](?<number>\d+)'
     regex: ^(pull|pull\-requests|pr)[/-]
     source-branches:
     - main
-    - release
-    - feature
     pre-release-weight: 30000
   unknown:
-    mode: ContinuousDelivery
-    label: '{BranchName}'
+    mode: ManualDeployment
     increment: Inherit
     regex: (?<BranchName>.*)
     source-branches:
@@ -70,7 +56,7 @@ branches:
     - pull-request
 ignore:
   sha: []
-mode: ContinuousDelivery
+mode: ManualDeployment
 label: '{BranchName}'
 increment: Inherit
 prevent-increment-of-merged-branch-version: false

diff --git a/src/GitVersion.Core.Tests/IntegrationTests/ComparingTheBehaviorOfDifferentVersioningModes.cs b/src/GitVersion.Core.Tests/IntegrationTests/ComparingTheBehaviorOfDifferentVersioningModes.cs
@@ -20,7 +20,7 @@ private static GitHubFlowConfigurationBuilder GetConfigurationBuilder() => GitHu
         );
 
     private static readonly IGitVersionConfiguration trunkBased = GetConfigurationBuilder()
-        .WithVersionStrategies(VersionStrategies.TrunkBased)
+        .WithVersionStrategy(VersionStrategies.TrunkBased)
         .WithBranch("main", _ => _.WithIsMainBranch(true).WithDeploymentMode(DeploymentMode.ContinuousDeployment))
         .WithBranch("feature", _ => _.WithIsMainBranch(false).WithDeploymentMode(DeploymentMode.ContinuousDelivery))
         .Build();