Skip to content

Commit fe31991

Browse files
committed
Update configuration.md and fix minor code review issues.
1 parent 3d9d911 commit fe31991

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

docs/input/docs/reference/configuration.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ minor-version-bump-message: '\+semver:\s?(feature|minor)'
4848
patch-version-bump-message: '\+semver:\s?(fix|patch)'
4949
no-bump-message: '\+semver:\s?(none|skip)'
5050
label-pre-release-weight: 60000
51+
commit-date-format: yyyy-MM-dd
52+
merge-message-formats: {}
53+
update-build-number: true
54+
semantic-version-format: Strict
5155
branches:
5256
develop:
5357
mode: ContinuousDeployment
@@ -154,9 +158,6 @@ branches:
154158
- support
155159
ignore:
156160
sha: []
157-
commit-date-format: yyyy-MM-dd
158-
merge-message-formats: {}
159-
update-build-number: true
160161
mode: ContinuousDelivery
161162
label: '{BranchName}'
162163
increment: Inherit
@@ -167,7 +168,6 @@ regex: ''
167168
tracks-release-branches: false
168169
is-release-branch: false
169170
is-mainline: false
170-
171171
```
172172
173173
The details of the available options are as follows:

src/GitVersion.Core.Tests/IntegrationTests/FeatureBranchScenarios.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ public void ShouldPickUpVersionFromMainAfterReleaseBranchMergedBack()
407407
// merge release into main
408408
fixture.Checkout(MainBranch);
409409
fixture.MergeNoFF("release/1.0.0");
410-
//fixture.AssertFullSemverNew("1.0.1+2", configuration);
410+
fixture.AssertFullSemver("1.0.1+2", configuration);
411411

412412
// create a misnamed feature branch (i.e. it uses the default configuration) from main and verify the version
413413
fixture.BranchTo("misnamed");

src/GitVersion.Core/Configuration/ConfigurationBuilderBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,8 +425,8 @@ private static void ValidateConfiguration(GitVersionConfiguration configuration)
425425

426426
public record BranchMetaData
427427
{
428-
public string Name { get; set; }
428+
public string Name { get; init; }
429429

430-
public string RegexPattern { get; set; }
430+
public string RegexPattern { get; init; }
431431
}
432432
}

0 commit comments

Comments
 (0)