Skip to content

#2268 Correct a version calculation for non-master mainline branches #2269

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
asbjornu merged 2 commits into from
May 12, 2020
Merged

#2268 Correct a version calculation for non-master mainline branches #2269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5138209
2268 Add a version calculation test for non-master mainline branches
Kirill-Maurin May 12, 2020
1d254c3
#2268 Correct a version calculation for non-master mainline branches
Kirill-Maurin May 11, 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
26 changes: 22 additions & 4 deletions src/GitVersionCore.Tests/IntegrationTests/MainlineDevelopmentMode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,24 @@ public class MainlineDevelopmentMode : TestBase
VersioningMode = VersioningMode.Mainline
};

[Test]
public void VerifyNonMasterMainlineVersionIdenticalAsMaster()
{
using var fixture = new EmptyRepositoryFixture();
fixture.Repository.MakeACommit("1");

fixture.BranchTo("feature/foo", "foo");
fixture.MakeACommit("2 +semver: major");
fixture.Checkout("master");
fixture.MergeNoFF("feature/foo");

fixture.AssertFullSemver("1.0.0", config);

fixture.BranchTo("support/1.0", "support");

fixture.AssertFullSemver("1.0.0", config);
}

[Test]
public void MergedFeatureBranchesToMasterImpliesRelease()
{
Expand Down Expand Up @@ -117,7 +135,7 @@ public void SupportBranches()
fixture.AssertFullSemver("1.0.2", config);

fixture.BranchTo("support/1.0", "support10");
fixture.AssertFullSemver("1.0.3", config);
fixture.AssertFullSemver("1.0.2", config);

// Move master on
fixture.Checkout("master");
Expand All @@ -126,9 +144,9 @@ public void SupportBranches()

// Continue on support/1.0
fixture.Checkout("support/1.0");
fixture.MakeACommit(); // 1.0.3
fixture.MakeACommit(); // 1.0.4
fixture.MakeACommit(); // 1.0.5
fixture.AssertFullSemver("1.0.5", config);
fixture.AssertFullSemver("1.0.4", config);
fixture.BranchTo("feature/foo", "foo");
fixture.AssertFullSemver("1.0.5-foo.0", config);
fixture.MakeACommit();
Expand Down Expand Up @@ -185,7 +203,7 @@ public void VerifySupportForwardMerge()
fixture.MakeACommit();
fixture.AssertFullSemver("1.1.2", config);
fixture.Checkout("support/1.0");
fixture.AssertFullSemver("1.0.4", config);
fixture.AssertFullSemver("1.0.3", config);

fixture.BranchTo("feature/foo", "foo");
fixture.MakeACommit();
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionCore/VersionCalculation/MainlineVersionCalculator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public SemanticVersion FindMainlineModeVersion(BaseVersion baseVersion)
mainlineVersion.BuildMetaData = CreateVersionBuildMetaData(mergeBase);

// branches other than master always get a bump for the act of branching
if (context.CurrentBranch.FriendlyName != "master")
if (!context.CurrentBranch.IsSameBranch(mainline))
{
var branchIncrement = FindMessageIncrement(null, context.CurrentCommit, mergeBase, mainlineCommitLog);
log.Info($"Performing {branchIncrement} increment for current branch ");
Expand Down