Enable direct commits on master which do not increment SemVer

Author: JakeGinnivan

src/GitVersionCore.Tests/IntegrationTests/MainlineDevelopmentMode.cs

@@ -76,6 +76,9 @@ public void MergedFeatureBranchesToMasterImpliesRelease()
             // One more direct commit for good measure
             fixture.MakeACommit("10 +semver: minor");
             fixture.AssertFullSemver(config, "3.3.0+14");
+            // And we can commit without bumping semver
+            fixture.MakeACommit("11 +semver: none");
+            fixture.AssertFullSemver(config, "3.3.0+15");
             Console.WriteLine(fixture.SequenceDiagram.GetDiagram());
         }
     }

src/GitVersionCore.Tests/TestEffectiveConfiguration.cs

@@ -22,6 +22,7 @@ public TestEffectiveConfiguration(
             string majorMessage = null,
             string minorMessage = null,
             string patchMessage = null,
+            string noBumpMessage = null,
             CommitMessageIncrementMode commitMessageMode = CommitMessageIncrementMode.Enabled,
             int legacySemVerPadding = 4,
             int buildMetaDataPadding = 4,
@@ -32,7 +33,7 @@ public TestEffectiveConfiguration(
             base(assemblyVersioningScheme, assemblyInformationalFormat, versioningMode, gitTagPrefix, tag, nextVersion, IncrementStrategy.Patch,
                     branchPrefixToTrim, preventIncrementForMergedBranchVersion, tagNumberPattern, continuousDeploymentFallbackTag,
                     trackMergeTarget,
-                    majorMessage, minorMessage, patchMessage,
+                    majorMessage, minorMessage, patchMessage, noBumpMessage,
                     commitMessageMode, legacySemVerPadding, buildMetaDataPadding, commitsSinceVersionSourcePadding,
                     versionFilters ?? Enumerable.Empty<IVersionFilter>(),
                     isDevelop, isRelease)

src/GitVersionCore/Configuration/Config.cs

@@ -52,6 +52,9 @@ public string NextVersion
         [YamlMember(Alias = "patch-version-bump-message")]
         public string PatchVersionBumpMessage { get; set; }
 
+        [YamlMember(Alias = "no-bump-message")]
+        public string NoBumpMessage { get; set; }
+
         [YamlMember(Alias = "legacy-semver-padding")]
         public int? LegacySemVerPadding { get; set; }
 

src/GitVersionCore/Configuration/ConfigurationProvider.cs

@@ -62,6 +62,7 @@ public static void ApplyDefaultsTo(Config config)
             config.MajorVersionBumpMessage = config.MajorVersionBumpMessage ?? IncrementStrategyFinder.DefaultMajorPattern;
             config.MinorVersionBumpMessage = config.MinorVersionBumpMessage ?? IncrementStrategyFinder.DefaultMinorPattern;
             config.PatchVersionBumpMessage = config.PatchVersionBumpMessage ?? IncrementStrategyFinder.DefaultPatchPattern;
+            config.NoBumpMessage = config.NoBumpMessage ?? IncrementStrategyFinder.DefaultNoBumpPattern;
             config.CommitMessageIncrementing = config.CommitMessageIncrementing ?? CommitMessageIncrementMode.Enabled;
             config.LegacySemVerPadding = config.LegacySemVerPadding ?? 4;
             config.BuildMetaDataPadding = config.BuildMetaDataPadding ?? 4;

src/GitVersionCore/EffectiveConfiguration.cs

@@ -21,6 +21,7 @@ public EffectiveConfiguration(
             string majorVersionBumpMessage,
             string minorVersionBumpMessage,
             string patchVersionBumpMessage,
+            string noBumpMessage,
             CommitMessageIncrementMode commitMessageIncrementing,
             int legacySemVerPaddding,
             int buildMetaDataPadding,
@@ -44,6 +45,7 @@ public EffectiveConfiguration(
             MajorVersionBumpMessage = majorVersionBumpMessage;
             MinorVersionBumpMessage = minorVersionBumpMessage;
             PatchVersionBumpMessage = patchVersionBumpMessage;
+            NoBumpMessage = noBumpMessage;
             CommitMessageIncrementing = commitMessageIncrementing;
             LegacySemVerPadding = legacySemVerPaddding;
             BuildMetaDataPadding = buildMetaDataPadding;
@@ -91,6 +93,7 @@ public EffectiveConfiguration(
 
         public string PatchVersionBumpMessage { get; private set; }
 
+        public string NoBumpMessage { get; private set; }
         public int LegacySemVerPadding { get; private set; }
         public int BuildMetaDataPadding { get; private set; }
 

src/GitVersionCore/GitVersionContext.cs

@@ -123,6 +123,7 @@ void CalculateEffectiveConfiguration()
             var majorMessage = FullConfiguration.MajorVersionBumpMessage;
             var minorMessage = FullConfiguration.MinorVersionBumpMessage;
             var patchMessage = FullConfiguration.PatchVersionBumpMessage;
+            var noBumpMessage = FullConfiguration.NoBumpMessage;
 
             var commitMessageVersionBump = currentBranchConfig.Value.CommitMessageIncrementing ?? FullConfiguration.CommitMessageIncrementing.Value;
 
@@ -132,7 +133,7 @@ void CalculateEffectiveConfiguration()
                 preventIncrementForMergedBranchVersion,
                 tagNumberPattern, FullConfiguration.ContinuousDeploymentFallbackTag,
                 trackMergeTarget,
-                majorMessage, minorMessage, patchMessage,
+                majorMessage, minorMessage, patchMessage, noBumpMessage,
                 commitMessageVersionBump,
                 FullConfiguration.LegacySemVerPadding.Value,
                 FullConfiguration.BuildMetaDataPadding.Value,

src/GitVersionCore/IncrementStrategyFinder.cs

@@ -19,6 +19,7 @@ public static class IncrementStrategyFinder
         public const string DefaultMajorPattern = @"\+semver:\s?(breaking|major)";
         public const string DefaultMinorPattern = @"\+semver:\s?(feature|minor)";
         public const string DefaultPatchPattern = @"\+semver:\s?(fix|patch)";
+        public const string DefaultNoBumpPattern = @"\+semver:\s?(none|skip)";
 
         public static VersionField? DetermineIncrementedField(GitVersionContext context, BaseVersion baseVersion)
         {
@@ -69,9 +70,10 @@ public static class IncrementStrategyFinder
             var majorRegex = CreateRegex(context.Configuration.MajorVersionBumpMessage ?? DefaultMajorPattern);
             var minorRegex = CreateRegex(context.Configuration.MinorVersionBumpMessage ?? DefaultMinorPattern);
             var patchRegex = CreateRegex(context.Configuration.PatchVersionBumpMessage ?? DefaultPatchPattern);
+            var none = CreateRegex(context.Configuration.NoBumpMessage ?? DefaultNoBumpPattern);
 
             var increments = commits
-                .Select(c => FindIncrementFromMessage(c.Message, majorRegex, minorRegex, patchRegex))
+                .Select(c => FindIncrementFromMessage(c.Message, majorRegex, minorRegex, patchRegex, none))
                 .Where(v => v != null)
                 .Select(v => v.Value)
                 .ToList();
@@ -110,11 +112,12 @@ private static IEnumerable<Commit> GetIntermediateCommits(IRepository repo, Comm
             }
         }
 
-        private static VersionField? FindIncrementFromMessage(string message, Regex major, Regex minor, Regex patch)
+        private static VersionField? FindIncrementFromMessage(string message, Regex major, Regex minor, Regex patch, Regex none)
         {
             if (major.IsMatch(message)) return VersionField.Major;
             if (minor.IsMatch(message)) return VersionField.Minor;
             if (patch.IsMatch(message)) return VersionField.Patch;
+            if (none.IsMatch(message)) return VersionField.None;
 
             return null;
         }