Skip to content

Allow use of features and hotfixes with mainline mode #2480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 29, 2020
Merged

Allow use of features and hotfixes with mainline mode #2480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
369fa11
Ignore versions with PreRelease tags when getting base version in mai…
Dec 16, 2020
f5b6b67
Condense code change to avoid repetition
Dec 16, 2020
839b6ec
Added tests to cover using increment: minor on feature branches
Dec 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions src/GitVersionCore.Tests/VersionCalculation/BaseVersionCalculatorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,45 @@ public void ShouldFilterVersion()
baseVersion.SemanticVersion.ShouldBe(lowerVersion.SemanticVersion);
}

[Test]
public void ShouldIgnorePreReleaseVersionInMainlineMode()
{
var fakeIgnoreConfig = new TestIgnoreConfig(new ExcludeSourcesContainingExclude());

var lowerVersion = new BaseVersion("dummy", false, new SemanticVersion(1), new MockCommit(), null);
var preReleaseVersion = new BaseVersion(
"prerelease",
false,
new SemanticVersion(1, 0, 1)
{
PreReleaseTag = new SemanticVersionPreReleaseTag
{
Name = "alpha",
Number = 1
}
},
new MockCommit(),
null
);

var versionCalculator = GetBaseVersionCalculator(contextBuilder =>
{
contextBuilder
.WithConfig(new Config { VersioningMode = VersioningMode.Mainline, Ignore = fakeIgnoreConfig })
.OverrideServices(services =>
{
services.RemoveAll<IVersionStrategy>();
services.AddSingleton<IVersionStrategy>(new TestVersionStrategy(preReleaseVersion, lowerVersion));
});
});
var baseVersion = versionCalculator.GetBaseVersion();

baseVersion.Source.ShouldNotBe(preReleaseVersion.Source);
baseVersion.SemanticVersion.ShouldNotBe(preReleaseVersion.SemanticVersion);
baseVersion.Source.ShouldBe(lowerVersion.Source);
baseVersion.SemanticVersion.ShouldBe(lowerVersion.SemanticVersion);
}

private static IBaseVersionCalculator GetBaseVersionCalculator(Action<GitVersionContextBuilder> contextBuilderAction)
{
var contextBuilder = new GitVersionContextBuilder();
Expand Down
91 changes: 91 additions & 0 deletions src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,97 @@ public void MergeIntoMainline()
fixture.AssertFullSemver("1.0.0", config);
}

[Test]
public void MergeFeatureIntoMainline()
{
var config = new Config
{
VersioningMode = VersioningMode.Mainline
};

using var fixture = new EmptyRepositoryFixture();
fixture.MakeACommit();
fixture.ApplyTag("1.0.0");
fixture.AssertFullSemver("1.0.0", config);

fixture.BranchTo("feature/foo");
fixture.MakeACommit();
fixture.AssertFullSemver("1.0.1-foo.1", config);
fixture.ApplyTag("1.0.1-foo.1");

fixture.Checkout("master");
fixture.MergeNoFF("feature/foo");
fixture.AssertFullSemver("1.0.1", config);
}

[Test]
public void MergeFeatureIntoMainlineWithMinorIncrement()
{
var config = new Config
{
VersioningMode = VersioningMode.Mainline,
Branches = new Dictionary<string, BranchConfig>()
{
{ "feature", new BranchConfig { Increment = IncrementStrategy.Minor } }
},
Ignore = new IgnoreConfig() { ShAs = new List<string>() },
MergeMessageFormats = new Dictionary<string, string>()
};

using var fixture = new EmptyRepositoryFixture();
fixture.MakeACommit();
fixture.ApplyTag("1.0.0");
fixture.AssertFullSemver("1.0.0", config);

fixture.BranchTo("feature/foo");
fixture.MakeACommit();
fixture.AssertFullSemver("1.1.0-foo.1", config);
fixture.ApplyTag("1.1.0-foo.1");

fixture.Checkout("master");
fixture.MergeNoFF("feature/foo");
fixture.AssertFullSemver("1.1.0", config);
}

[Test]
public void MergeFeatureIntoMainlineWithMinorIncrementAndThenMergeHotfix()
{
var config = new Config
{
VersioningMode = VersioningMode.Mainline,
Branches = new Dictionary<string, BranchConfig>()
{
{ "feature", new BranchConfig { Increment = IncrementStrategy.Minor } }
},
Ignore = new IgnoreConfig() { ShAs = new List<string>() },
MergeMessageFormats = new Dictionary<string, string>()
};

using var fixture = new EmptyRepositoryFixture();
fixture.MakeACommit();
fixture.ApplyTag("1.0.0");
fixture.AssertFullSemver("1.0.0", config);

fixture.BranchTo("feature/foo");
fixture.MakeACommit();
fixture.AssertFullSemver("1.1.0-foo.1", config);
fixture.ApplyTag("1.1.0-foo.1");

fixture.Checkout("master");
fixture.MergeNoFF("feature/foo");
fixture.AssertFullSemver("1.1.0", config);
fixture.ApplyTag("1.1.0");

fixture.BranchTo("hotfix/bar");
fixture.MakeACommit();
fixture.AssertFullSemver("1.1.1-beta.1", config);
fixture.ApplyTag("1.1.1-beta.1");

fixture.Checkout("master");
fixture.MergeNoFF("hotfix/bar");
fixture.AssertFullSemver("1.1.1", config);
}

[Test]
public void PreReleaseTagCanUseBranchNameVariable()
{
Expand Down
8 changes: 8 additions & 0 deletions src/GitVersionCore/VersionCalculation/BaseVersionCalculator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,14 @@ public BaseVersion GetBaseVersion()
.ToList();

FixTheBaseVersionSourceOfMergeMessageStrategyIfReleaseBranchWasMergedAndDeleted(baseVersions);

if (context.Configuration.VersioningMode == VersioningMode.Mainline)
{
baseVersions = baseVersions
.Where(b => !b.IncrementedVersion.PreReleaseTag.HasTag())
.ToList();
}

var maxVersion = baseVersions.Aggregate((v1, v2) => v1.IncrementedVersion > v2.IncrementedVersion ? v1 : v2);
var matchingVersionsOnceIncremented = baseVersions
.Where(b => b.Version.BaseVersionSource != null && b.IncrementedVersion == maxVersion.IncrementedVersion)
Expand Down