Merge branch 'master' into feature/test-for-1255

asbjornu · web-flow · commit ebe5e4709a86 · 2019-02-25T15:07:06.000+01:00
diff --git a/build.cake b/build.cake
@@ -442,9 +442,9 @@ Task("Pack")
 #region Publish
 
 Task("Release-Notes")
-    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows,  "Release notes are generated only on Windows agents.")
-    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAppVeyor, "Release notes are generated only on release agents.")
-    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsStableRelease(),   "Release notes are generated only for stable releases.")
+    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows,       "Release notes are generated only on Windows agents.")
+    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAzurePipeline, "Release notes are generated only on AzurePipeline.")
+    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsStableRelease(),        "Release notes are generated only for stable releases.")
     .IsDependentOn("Clean")
     .Does<BuildParameters>((parameters) =>
 {
@@ -458,8 +458,8 @@ Task("Release-Notes")
 });
 
 Task("Publish-Coverage")
-    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows,  "Publish-Coverage works only on Windows agents.")
-    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAppVeyor, "Publish-Coverage works only on AppVeyor.")
+    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows,       "Publish-Coverage works only on Windows agents.")
+    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAzurePipeline, "Publish-Coverage works only on AzurePipeline.")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.IsStableRelease() || parameters.IsPreRelease(), "Publish-Coverage works only for releases.")
     .IsDependentOn("Test")
     .Does<BuildParameters>((parameters) =>
@@ -481,7 +481,7 @@ Task("Publish-Coverage")
 });
 
 Task("Publish-AppVeyor")
-    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows, "Publish-AppVeyor works only on Windows agents.")
+    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows,  "Publish-AppVeyor works only on Windows agents.")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAppVeyor, "Publish-AppVeyor works only on AppVeyor.")
     .IsDependentOn("Pack")
     .IsDependentOn("Release-Notes")
@@ -509,9 +509,9 @@ Task("Publish-AppVeyor")
 });
 
 Task("Publish-AzurePipeline")
-    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows, "Publish-AzurePipeline works only on Windows agents.")
+    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows,       "Publish-AzurePipeline works only on Windows agents.")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAzurePipeline, "Publish-AzurePipeline works only on AzurePipeline.")
-    .WithCriteria<BuildParameters>((context, parameters) => !parameters.IsPullRequest, "Publish-AzurePipeline works only for non-PR commits.")
+    .WithCriteria<BuildParameters>((context, parameters) => !parameters.IsPullRequest,           "Publish-AzurePipeline works only for non-PR commits.")
     .IsDependentOn("Pack")
     .IsDependentOn("Release-Notes")
     .Does<BuildParameters>((parameters) =>
@@ -541,9 +541,9 @@ Task("Publish-AzurePipeline")
 });
 
 Task("Publish-Tfs")
-    .WithCriteria<BuildParameters>((context, parameters) => parameters.EnabledPublishTfs,   "Publish-Tfs was disabled.")
-    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows,  "Publish-Tfs works only on Windows agents.")
-    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAppVeyor, "Publish-Tfs works only on AppVeyor.")
+    .WithCriteria<BuildParameters>((context, parameters) => parameters.EnabledPublishTfs,        "Publish-Tfs was disabled.")
+    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows,       "Publish-Tfs works only on Windows agents.")
+    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAzurePipeline, "Publish-Tfs works only on AzurePipeline.")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.IsStableRelease(),   "Publish-Tfs works only for releases.")
     .IsDependentOn("Pack-Tfs")
     .Does<BuildParameters>((parameters) =>
@@ -577,9 +577,9 @@ Task("Publish-Tfs")
 });
 
 Task("Publish-Gem")
-    .WithCriteria<BuildParameters>((context, parameters) => parameters.EnabledPublishGem,   "Publish-Gem was disabled.")
-    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows,  "Publish-Gem works only on Windows agents.")
-    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAppVeyor, "Publish-Gem works only on AppVeyor.")
+    .WithCriteria<BuildParameters>((context, parameters) => parameters.EnabledPublishGem,        "Publish-Gem was disabled.")
+    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows,       "Publish-Gem works only on Windows agents.")
+    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAzurePipeline, "Publish-Gem works only on AzurePipeline.")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.IsStableRelease() || parameters.IsPreRelease(), "Publish-Gem works only for releases.")
     .IsDependentOn("Pack-Gem")
     .Does<BuildParameters>((parameters) =>
@@ -605,9 +605,9 @@ Task("Publish-Gem")
 });
 
 Task("Publish-DockerHub")
-    .WithCriteria<BuildParameters>((context, parameters) => parameters.EnabledPublishDocker, "Publish-DockerHub was disabled.")
-    .WithCriteria<BuildParameters>((context, parameters) => !parameters.IsRunningOnMacOS,    "Publish-DockerHub works only on Windows and Linux agents.")
-    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAppVeyor || (parameters.IsRunningOnTravis && !parameters.IsRunningOnMacOS), "Publish-DockerHub works only on AppVeyor or Travis.")
+    .WithCriteria<BuildParameters>((context, parameters) => parameters.EnabledPublishDocker,     "Publish-DockerHub was disabled.")
+    .WithCriteria<BuildParameters>((context, parameters) => !parameters.IsRunningOnMacOS,        "Publish-DockerHub works only on Windows and Linux agents.")
+    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAzurePipeline, "Publish-DockerHub works only on AzurePipeline.")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.IsStableRelease() || parameters.IsPreRelease(), "Publish-DockerHub works only for releases.")
     .IsDependentOn("Docker-Build")
     .Does<BuildParameters>((parameters) =>
@@ -645,9 +645,9 @@ Task("Publish-DockerHub")
 });
 
 Task("Publish-NuGet")
-    .WithCriteria<BuildParameters>((context, parameters) => parameters.EnabledPublishNuget, "Publish-NuGet was disabled.")
-    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows,  "Publish-NuGet works only on Windows agents.")
-    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAppVeyor, "Publish-NuGet works only on AppVeyor.")
+    .WithCriteria<BuildParameters>((context, parameters) => parameters.EnabledPublishNuget,      "Publish-NuGet was disabled.")
+    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows,       "Publish-NuGet works only on Windows agents.")
+    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAzurePipeline, "Publish-NuGet works only on AzurePipeline.")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.IsStableRelease() || parameters.IsPreRelease(), "Publish-NuGet works only for releases.")
     .IsDependentOn("Pack-NuGet")
     .Does<BuildParameters>((parameters) =>
@@ -685,7 +685,7 @@ Task("Publish-NuGet")
 Task("Publish-Chocolatey")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.EnabledPublishChocolatey, "Publish-Chocolatey was disabled.")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows,       "Publish-Chocolatey works only on Windows agents.")
-    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAppVeyor,      "Publish-Chocolatey works only on AppVeyor.")
+    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAzurePipeline, "Publish-Chocolatey works only on AzurePipeline.")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.IsStableRelease() || parameters.IsPreRelease(), "Publish-Chocolatey works only for releases.")
     .IsDependentOn("Pack-Chocolatey")
     .Does<BuildParameters>((parameters) =>
diff --git a/build/tmpl/jobs.yml b/build/tmpl/jobs.yml
@@ -19,3 +19,20 @@ jobs:
         addToPath: true # Optional
   - powershell: ./build.ps1 -script build.cake -target Default
     displayName: 'Cake build'
+    env:
+      GITHUB_TOKEN: $(GITHUB_TOKEN)
+      DOCKER_USERNAME: $(DOCKER_USERNAME)
+      DOCKER_PASSWORD: $(DOCKER_PASSWORD)
+      NUGET_API_KEY: $(NUGET_API_KEY)
+      NUGET_API_URL: $(NUGET_API_URL)
+      CHOCOLATEY_API_KEY: $(CHOCOLATEY_API_KEY)
+      CHOCOLATEY_API_URL: $(CHOCOLATEY_API_URL)
+      RUBY_GEM_API_KEY: $(RUBY_GEM_API_KEY)
+      TFX_TOKEN: $(TFX_TOKEN)
+      CODECOV_TOKEN: $(CODECOV_TOKEN)
+      ENABLED_UNIT_TESTS: $(ENABLED_UNIT_TESTS)
+      ENABLED_PUBLISH_GEM: $(ENABLED_PUBLISH_GEM)
+      ENABLED_PUBLISH_TFS: $(ENABLED_PUBLISH_TFS)
+      ENABLED_PUBLISH_NUGET: $(ENABLED_PUBLISH_NUGET)
+      ENABLED_PUBLISH_CHOCOLATEY: $(ENABLED_PUBLISH_CHOCOLATEY)
+      ENABLED_PUBLISH_DOCKER: $(ENABLED_PUBLISH_DOCKER)
diff --git a/src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs
@@ -201,7 +201,7 @@ public void WhenMultipleDevelopBranchesExistAndCurrentBranchHasIncrementInheritP
             fixture.Repository.MakeACommit();
             fixture.Repository.MergeNoFF("develop");
 
-            fixture.AssertFullSemver("1.0.1-x.1+3");
+            fixture.AssertFullSemver("1.1.0-x.1+3");
         }
     }
 }
diff --git a/src/GitVersionCore.Tests/IntegrationTests/FeatureBranchScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/FeatureBranchScenarios.cs
@@ -552,4 +552,49 @@ public void PickUpVersionFromMasterMarkedWithIsTracksReleaseBranches()
             fixture.AssertFullSemver(config, "0.10.1-MyFeatureD.1+1");
         }
     }
+
+    [Test]
+    public void ShouldHaveAGreaterSemVerAfterDevelopIsMergedIntoFeature()
+    {
+        var config = new Config()
+        {
+            VersioningMode = VersioningMode.ContinuousDeployment,
+            AssemblyVersioningScheme = AssemblyVersioningScheme.Major,
+            AssemblyFileVersioningFormat = "{MajorMinorPatch}.{env:WeightedPreReleaseNumber ?? 0}",
+            LegacySemVerPadding = 4,
+            BuildMetaDataPadding = 4,
+            CommitsSinceVersionSourcePadding = 4,
+            CommitMessageIncrementing = CommitMessageIncrementMode.Disabled,
+            Branches = new Dictionary<string, BranchConfig>
+            {
+                {
+                    "develop", new BranchConfig()
+                    {
+                        PreventIncrementOfMergedBranchVersion = true
+                    }
+                },
+                {
+                    "feature", new BranchConfig()
+                    {
+                        Tag = "feat-{BranchName}"
+                    }
+                }
+            }
+        };
+        using (var fixture = new EmptyRepositoryFixture())
+        {
+            fixture.MakeACommit();
+            fixture.BranchTo("develop");
+            fixture.MakeACommit();
+            fixture.ApplyTag("16.23.0");
+            fixture.MakeACommit();
+            fixture.BranchTo("feature/featX");
+            fixture.MakeACommit();
+            fixture.Checkout("develop");
+            fixture.MakeACommit();
+            fixture.Checkout("feature/featX");
+            fixture.MergeNoFF("develop");
+            fixture.AssertFullSemver(config, "16.24.0-feat-featX.4");
+        }
+    }
 }
diff --git a/src/GitVersionCore/BranchConfigurationCalculator.cs b/src/GitVersionCore/BranchConfigurationCalculator.cs
@@ -142,11 +142,21 @@ static BranchConfig InheritBranchConfiguration(GitVersionContext context, Branch
                 // To prevent infinite loops, make sure that a new branch was chosen.
                 if (targetBranch.IsSameBranch(chosenBranch))
                 {
-                    Logger.WriteWarning("Fallback branch wants to inherit Increment branch configuration from itself. Using patch increment instead.");
-                    return new BranchConfig(branchConfiguration)
+                    BranchConfig developOrMasterConfig =
+                        ChooseMasterOrDevelopIncrementStrategyIfTheChosenBranchIsOneOfThem(
+                            chosenBranch, branchConfiguration, config);
+                    if (developOrMasterConfig != null)
                     {
-                        Increment = IncrementStrategy.Patch
-                    };
+                        return developOrMasterConfig;
+                    }
+                    else
+                    {
+                        Logger.WriteWarning("Fallback branch wants to inherit Increment branch configuration from itself. Using patch increment instead.");
+                        return new BranchConfig(branchConfiguration)
+                        {
+                            Increment = IncrementStrategy.Patch
+                        };
+                    }
                 }
 
                 var inheritingBranchConfig = GetBranchConfiguration(context, chosenBranch, excludedInheritBranches);
@@ -201,5 +211,39 @@ static Branch[] CalculateWhenMultipleParents(IRepository repository, Commit curr
 
             return excludedBranches;
         }
+
+        private static BranchConfig
+            ChooseMasterOrDevelopIncrementStrategyIfTheChosenBranchIsOneOfThem(Branch ChosenBranch,
+                BranchConfig BranchConfiguration, Config config)
+        {
+            BranchConfig masterOrDevelopConfig = null;
+            var developBranchRegex = config.Branches[ConfigurationProvider.DevelopBranchKey].Regex;
+            var masterBranchRegex = config.Branches[ConfigurationProvider.MasterBranchKey].Regex;
+            if (Regex.IsMatch(ChosenBranch.FriendlyName, developBranchRegex, RegexOptions.IgnoreCase))
+            {
+                // Normally we would not expect this to happen but for safety we add a check
+                if (config.Branches[ConfigurationProvider.DevelopBranchKey].Increment !=
+                    IncrementStrategy.Inherit)
+                {
+                    masterOrDevelopConfig = new BranchConfig(BranchConfiguration)
+                    {
+                        Increment = config.Branches[ConfigurationProvider.DevelopBranchKey].Increment
+                    };
+                }
+            }
+            else if (Regex.IsMatch(ChosenBranch.FriendlyName, masterBranchRegex, RegexOptions.IgnoreCase))
+            {
+                // Normally we would not expect this to happen but for safety we add a check
+                if (config.Branches[ConfigurationProvider.MasterBranchKey].Increment !=
+                    IncrementStrategy.Inherit)
+                {
+                    masterOrDevelopConfig = new BranchConfig(BranchConfiguration)
+                    {
+                        Increment = config.Branches[ConfigurationProvider.DevelopBranchKey].Increment
+                    };
+                }
+            }
+            return masterOrDevelopConfig;
+        }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ public void WhenMultipleDevelopBranchesExistAndCurrentBranchHasIncrementInheritP`
`201`	`201`	`fixture.Repository.MakeACommit();`
`202`	`202`	`fixture.Repository.MergeNoFF("develop");`
`203`	`203`
`204`		`- fixture.AssertFullSemver("1.0.1-x.1+3");`
	`204`	`+ fixture.AssertFullSemver("1.1.0-x.1+3");`
`205`	`205`	`}`
`206`	`206`	`}`
`207`	`207`	`}`