Skip to content

Commit 9c35a70

Browse files
JakeGinnivanJakeGinnivan
committed
Switched develop default tag to alpha
1 parent b3b1c6d commit 9c35a70

10 files changed

+34
-34
lines changed

‎src/GitVersionCore.Tests/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ branches:
5050
track-merge-target: false
5151
dev(elop)?(ment)?$:
5252
mode: ContinuousDeployment
53-
tag: unstable
53+
tag: alpha
5454
increment: Minor
5555
prevent-increment-of-merged-branch-version: false
5656
track-merge-target: true

‎src/GitVersionCore.Tests/ConfigProviderTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public void CanProvideConfigForNewBranch()
113113
tag: bugfix";
114114
SetupConfigFileContent(text);
115115
var config = ConfigurationProvider.Provide(repoPath, fileSystem);
116-
116+
117117
config.Branches["bug[/-]"].Tag.ShouldBe("bugfix");
118118
}
119119

@@ -162,7 +162,7 @@ public void CanReadDefaultDocument()
162162
var config = ConfigurationProvider.Provide(repoPath, fileSystem);
163163
config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinorPatch);
164164
config.AssemblyInformationalFormat.ShouldBe(null);
165-
config.Branches["dev(elop)?(ment)?$"].Tag.ShouldBe("unstable");
165+
config.Branches["dev(elop)?(ment)?$"].Tag.ShouldBe("alpha");
166166
config.Branches["releases?[/-]"].Tag.ShouldBe("beta");
167167
config.TagPrefix.ShouldBe(ConfigurationProvider.DefaultTagPrefix);
168168
config.NextVersion.ShouldBe(null);

‎src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public void WhenDevelopHasMultipleCommits_SpecifyExistingCommitId()
2121
fixture.Repository.MakeACommit();
2222
fixture.Repository.MakeACommit();
2323

24-
fixture.AssertFullSemver("1.1.0-unstable.3", commitId: thirdCommit.Sha);
24+
fixture.AssertFullSemver("1.1.0-alpha.3", commitId: thirdCommit.Sha);
2525
}
2626
}
2727

@@ -39,7 +39,7 @@ public void WhenDevelopHasMultipleCommits_SpecifyNonExistingCommitId()
3939
fixture.Repository.MakeACommit();
4040
fixture.Repository.MakeACommit();
4141

42-
fixture.AssertFullSemver("1.1.0-unstable.5", commitId: "nonexistingcommitid");
42+
fixture.AssertFullSemver("1.1.0-alpha.5", commitId: "nonexistingcommitid");
4343
}
4444
}
4545

@@ -98,7 +98,7 @@ public void WhenDevelopBranchedFromMaster_MinorIsIncreased()
9898
fixture.Repository.MakeATaggedCommit("1.0.0");
9999
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
100100
fixture.Repository.MakeACommit();
101-
fixture.AssertFullSemver("1.1.0-unstable.1");
101+
fixture.AssertFullSemver("1.1.0-alpha.1");
102102
}
103103
}
104104

@@ -117,7 +117,7 @@ public void MergingReleaseBranchBackIntoDevelopWithMergingToMaster_DoesBumpDevel
117117

118118
fixture.Repository.Checkout("develop");
119119
fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
120-
fixture.AssertFullSemver("2.1.0-unstable.2");
120+
fixture.AssertFullSemver("2.1.0-alpha.2");
121121
}
122122
}
123123

@@ -155,14 +155,14 @@ public void WhenDevelopBranchedFromMasterDetachedHead_MinorIsIncreased()
155155
var commit = fixture.Repository.Head.Tip;
156156
fixture.Repository.MakeACommit();
157157
fixture.Repository.Checkout(commit);
158-
fixture.AssertFullSemver("1.1.0-unstable.1");
158+
fixture.AssertFullSemver("1.1.0-alpha.1");
159159
}
160160
}
161161

162162
[Test]
163163
public void InheritVersionFromReleaseBranch()
164164
{
165-
using (var fixture = new EmptyRepositoryFixture(new Config()))
165+
using (var fixture = new EmptyRepositoryFixture())
166166
{
167167
fixture.MakeATaggedCommit("1.0.0");
168168
fixture.BranchTo("develop");
@@ -171,11 +171,11 @@ public void InheritVersionFromReleaseBranch()
171171
fixture.MakeACommit();
172172
fixture.MakeACommit();
173173
fixture.Checkout("develop");
174-
fixture.AssertFullSemver("2.1.0-unstable.0");
174+
fixture.AssertFullSemver("2.1.0-alpha.0");
175175
fixture.MakeACommit();
176-
fixture.AssertFullSemver("2.1.0-unstable.1");
176+
fixture.AssertFullSemver("2.1.0-alpha.1");
177177
fixture.MergeNoFF("release/2.0.0");
178-
fixture.AssertFullSemver("2.1.0-unstable.4");
178+
fixture.AssertFullSemver("2.1.0-alpha.4");
179179
fixture.BranchTo("feature/MyFeature");
180180
fixture.MakeACommit();
181181
fixture.AssertFullSemver("2.1.0-MyFeature.1+1");

‎src/GitVersionCore.Tests/IntegrationTests/DocumentationSamples.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public void GitFlowFeatureBranch()
2222

2323
// Branch to develop
2424
fixture.MakeACommit();
25-
fixture.AssertFullSemver("1.3.0-unstable.1");
25+
fixture.AssertFullSemver("1.3.0-alpha.1");
2626

2727
// Open Pull Request
2828
fixture.BranchTo("feature/myfeature", "feature");
@@ -37,7 +37,7 @@ public void GitFlowFeatureBranch()
3737
fixture.SequenceDiagram.Destroy("feature/myfeature");
3838
fixture.SequenceDiagram.NoteOver("Feature branches should\r\n" +
3939
"be deleted once merged", "feature/myfeature");
40-
fixture.AssertFullSemver("1.3.0-unstable.3");
40+
fixture.AssertFullSemver("1.3.0-alpha.3");
4141
}
4242
}
4343

@@ -56,7 +56,7 @@ public void GitFlowPullRequestBranch()
5656

5757
// Branch to develop
5858
fixture.MakeACommit();
59-
fixture.AssertFullSemver("1.3.0-unstable.1");
59+
fixture.AssertFullSemver("1.3.0-alpha.1");
6060

6161
// Open Pull Request
6262
fixture.BranchTo("pull/2/merge", "pr");
@@ -71,7 +71,7 @@ public void GitFlowPullRequestBranch()
7171
fixture.SequenceDiagram.Destroy("pull/2/merge");
7272
fixture.SequenceDiagram.NoteOver("Feature branches/pr's should\r\n" +
7373
"be deleted once merged", "pull/2/merge");
74-
fixture.AssertFullSemver("1.3.0-unstable.3");
74+
fixture.AssertFullSemver("1.3.0-alpha.3");
7575
}
7676
}
7777

@@ -129,7 +129,7 @@ public void GitFlowMinorRelease()
129129
// Make another commit on develop
130130
fixture.Checkout("develop");
131131
fixture.MakeACommit();
132-
fixture.AssertFullSemver("1.4.0-unstable.1");
132+
fixture.AssertFullSemver("1.4.0-alpha.1");
133133

134134
// Make a commit to release-1.3.0
135135
fixture.Checkout("release/1.3.0");
@@ -158,7 +158,7 @@ public void GitFlowMinorRelease()
158158

159159
// Not 0 for commit count as we can't know the increment rules of the merged branch
160160
fixture.Checkout("develop");
161-
fixture.AssertFullSemver("1.4.0-unstable.4");
161+
fixture.AssertFullSemver("1.4.0-alpha.4");
162162
}
163163
}
164164

@@ -185,7 +185,7 @@ public void GitFlowMajorRelease()
185185
// Make another commit on develop
186186
fixture.Checkout("develop");
187187
fixture.MakeACommit();
188-
fixture.AssertFullSemver("2.1.0-unstable.1");
188+
fixture.AssertFullSemver("2.1.0-alpha.1");
189189

190190
// Make a commit to release-2.0.0
191191
fixture.Checkout("release/2.0.0");
@@ -215,7 +215,7 @@ public void GitFlowMajorRelease()
215215

216216
// Not 0 for commit count as we can't know the increment rules of the merged branch
217217
fixture.Checkout("develop");
218-
fixture.AssertFullSemver("2.1.0-unstable.4");
218+
fixture.AssertFullSemver("2.1.0-alpha.4");
219219
}
220220
}
221221

‎src/GitVersionCore.Tests/IntegrationTests/HotfixBranchScenarios.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ public void PatchLatestReleaseExample()
3737

3838
// Verify develop version
3939
fixture.Repository.Checkout("develop");
40-
fixture.AssertFullSemver("1.3.0-unstable.1");
40+
fixture.AssertFullSemver("1.3.0-alpha.1");
4141

4242
fixture.Repository.MergeNoFF("hotfix-1.2.1", Generate.SignatureNow());
43-
fixture.AssertFullSemver("1.3.0-unstable.5");
43+
fixture.AssertFullSemver("1.3.0-alpha.5");
4444
}
4545
}
4646

@@ -118,9 +118,9 @@ public void PatchOlderReleaseExample()
118118

119119
// Verify develop version
120120
fixture.Repository.Checkout("develop");
121-
fixture.AssertFullSemver("2.1.0-unstable.1");
121+
fixture.AssertFullSemver("2.1.0-alpha.1");
122122
fixture.Repository.MergeNoFF("support-1.1", Generate.SignatureNow());
123-
fixture.AssertFullSemver("2.1.0-unstable.7");
123+
fixture.AssertFullSemver("2.1.0-alpha.7");
124124
}
125125
}
126126
}

‎src/GitVersionCore.Tests/IntegrationTests/OtherScenarios.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void AllowNotHavingMaster()
4040
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
4141
fixture.Repository.Branches.Remove(fixture.Repository.Branches["master"]);
4242

43-
fixture.AssertFullSemver("1.1.0-unstable.1");
43+
fixture.AssertFullSemver("1.1.0-alpha.1");
4444
}
4545
}
4646

@@ -60,7 +60,7 @@ public void DoNotBlowUpWhenDevelopAndFeatureBranchPointAtSameCommit()
6060
fixture.LocalRepositoryFixture.Repository.Checkout(fixture.Repository.Head.Tip);
6161
fixture.LocalRepositoryFixture.Repository.Branches.Remove("master");
6262
fixture.InitialiseRepo();
63-
fixture.AssertFullSemver("1.1.0-unstable.1");
63+
fixture.AssertFullSemver("1.1.0-alpha.1");
6464
}
6565
}
6666
}

‎src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public void NoMergeBacksToDevelopInCaseThereAreNoChangesInReleaseBranch()
2424

2525
fixture.Repository.Branches.Remove(releaseBranch);
2626

27-
fixture.AssertFullSemver("1.1.0-unstable.1");
27+
fixture.AssertFullSemver("1.1.0-alpha.1");
2828
}
2929
}
3030

@@ -48,12 +48,12 @@ public void NoMergeBacksToDevelopInCaseThereAreChangesInReleaseBranch()
4848
// Merge to develop
4949
fixture.Repository.Checkout("develop");
5050
fixture.Repository.MergeNoFF("release/1.0.0");
51-
fixture.AssertFullSemver("1.1.0-unstable.2");
51+
fixture.AssertFullSemver("1.1.0-alpha.2");
5252

5353
fixture.Repository.MakeACommit();
5454
fixture.Repository.Branches.Remove(releaseBranch);
5555

56-
fixture.AssertFullSemver("1.1.0-unstable.2");
56+
fixture.AssertFullSemver("1.1.0-alpha.2");
5757
}
5858
}
5959

@@ -226,7 +226,7 @@ public void WhenReleaseBranchIsMergedIntoDevelopHighestVersionIsTakenWithIt()
226226
fixture.Repository.Checkout("develop");
227227
fixture.Repository.MergeNoFF("release-1.0.0", Generate.SignatureNow());
228228

229-
fixture.AssertFullSemver("2.1.0-unstable.6");
229+
fixture.AssertFullSemver("2.1.0-alpha.6");
230230
}
231231
}
232232

@@ -265,7 +265,7 @@ public void WhenMergingReleaseBackToDevShouldNotResetBetaVersion()
265265
fixture.Repository.Checkout("develop");
266266

267267
fixture.Repository.MakeCommits(1);
268-
fixture.AssertFullSemver("1.1.0-unstable.1");
268+
fixture.AssertFullSemver("1.1.0-alpha.1");
269269

270270
fixture.Repository.CreateBranch("release-2.0.0");
271271
fixture.Repository.Checkout("release-2.0.0");

‎src/GitVersionCore.Tests/IntegrationTests/SwitchingToGitFlowScenarios.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public void WhenDevelopBranchedFromMasterWithLegacyVersionTags_DevelopCanUseReac
1515
fixture.Repository.MakeATaggedCommit("1.0.0.0");
1616
fixture.Repository.MakeCommits(2);
1717
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
18-
fixture.AssertFullSemver("1.1.0-unstable.2");
18+
fixture.AssertFullSemver("1.1.0-alpha.2");
1919
}
2020
}
2121
}

‎src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void AppliesBranchPreReleaseTag()
4848

4949
var version = sut.FindVersion(context);
5050

51-
version.ToString("f").ShouldBe("1.0.0-unstable.1+2");
51+
version.ToString("f").ShouldBe("1.0.0-alpha.1+2");
5252
}
5353

5454
[Test]

‎src/GitVersionCore/Configuration/ConfigurationProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public static void ApplyDefaultsTo(Config config)
4848
ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, "hotfix(es)?[/-]"), defaultTag: "beta");
4949
ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, "support[/-]"), defaultTag: string.Empty, defaultPreventIncrement: true);
5050
ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, "dev(elop)?(ment)?$"),
51-
defaultTag: "unstable",
51+
defaultTag: "alpha",
5252
defaultIncrementStrategy: IncrementStrategy.Minor,
5353
defaultVersioningMode: VersioningMode.ContinuousDeployment,
5454
defaultTrackMergeTarget: true,

0 commit comments

Comments
 (0)