Skip to content

Commit cc725ed

Browse files
committed
Squashed commit of the following:
commit f76d8b8 Merge: f6d86dc 8c6175c Author: Artur <[email protected]> Date: Wed Oct 26 09:05:35 2022 +0200 Merge pull request #3246 from arturcic/feature/markdown-lint Fix docs markdown lint errors commit 8c6175c Author: Artur <[email protected]> Date: Wed Oct 26 08:40:13 2022 +0200 #2964 - disable tests for .net48 commit 21c34fb Author: Artur <[email protected]> Date: Wed Oct 26 02:07:16 2022 +0200 #2964 - use bash for reporter commit 93f4637 Author: Artur <[email protected]> Date: Tue Oct 25 23:50:45 2022 +0200 #2964 fix markdown linting errors commit 18586fe Author: Artur <[email protected]> Date: Tue Oct 25 19:21:56 2022 +0200 #2964 fix html-proofer errors commit f6d86dc Author: Artur <[email protected]> Date: Tue Oct 25 16:15:45 2022 +0200 (build) fix set-output syntax https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/ commit 2cc427c Author: Artur <[email protected]> Date: Tue Oct 25 15:25:27 2022 +0200 Revert "(build) fix set-output syntax" This reverts commit b906175. commit b812802 Author: Artur <[email protected]> Date: Tue Oct 25 15:49:10 2022 +0200 Revert "(build) fix set-output syntax" This reverts commit b07a8b9. commit b07a8b9 Author: Artur <[email protected]> Date: Tue Oct 25 15:49:10 2022 +0200 (build) fix set-output syntax https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/ commit b906175 Author: Artur <[email protected]> Date: Tue Oct 25 15:25:27 2022 +0200 (build) fix set-output syntax https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/ commit 34f9de7 Author: Artur <[email protected]> Date: Tue Oct 25 14:08:54 2022 +0200 (build) update the actions/[email protected] commit f954025 Author: Artur <[email protected]> Date: Tue Oct 25 14:01:52 2022 +0200 (build) update the actions/[email protected] commit 819f116 Merge: 8cd3a1b cac4eb1 Author: Artur <[email protected]> Date: Tue Oct 25 13:26:41 2022 +0200 Merge pull request #3179 from chhh/feature/report-project-file-location Add local project file location to exception when parsing fails commit cac4eb1 Author: Dmitry Avtonomov <[email protected]> Date: Fri Aug 26 13:38:47 2022 -0700 Add local project file location to exception when parsing fails Helps in solutions with multiple projects, when one of csproj files becomes corrupt. User knows where to apply fixes. commit 8cd3a1b Merge: 3e5d1e7 1071e1c Author: Asbjørn Ulsberg <[email protected]> Date: Tue Oct 25 11:26:26 2022 +0200 Merge pull request #3208 from AlexPykavy/main Don't consider "tag-prefix" as optional if it's explicitly specified commit 1071e1c Author: Alexander Pykavy <[email protected]> Date: Mon Sep 26 21:12:26 2022 +0200 Don't consider "tag-prefix" as optional if it's explicitly specified To correctly calculate the next version with the prefix. For example, we develop the main product and some its plugin in the same repository and have the following git tags list: - 0.1.0 - 0.1.1 - 0.2.0 - 0.2.1 - plugin_0.1.0 - plugin_0.1.1 The expected next plugin version is `0.1.2` not `0.2.2` (`plugin_` prefix will be prepended before setting the tag).
1 parent 1ec297a commit cc725ed

File tree

1 file changed

+40
-20
lines changed

1 file changed

+40
-20
lines changed

docs/input/docs/reference/configuration.md

Lines changed: 40 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ major-version-bump-message: '\+semver:\s?(breaking|major)'
5252
minor-version-bump-message: '\+semver:\s?(feature|minor)'
5353
patch-version-bump-message: '\+semver:\s?(fix|patch)'
5454
no-bump-message: '\+semver:\s?(none|skip)'
55+
legacy-semver-padding: 4
56+
build-metadata-padding: 4
57+
commits-since-version-source-padding: 4
5558
tag-pre-release-weight: 60000
5659
commit-message-incrementing: Enabled
5760
ignore:
@@ -191,8 +194,23 @@ Used to tell GitVersion not to increment when in Mainline development mode.
191194
Default `\+semver:\s?(none|skip)`, which will match occurrences of `+semver:
192195
none` and `+semver: skip`
193196

194-
When a commit matches **both** the `no-bump-message` **and** any combination of
195-
the `version-bump-message`, `no-bump-message` takes precedence and no increment is applied.
197+
### legacy-semver-padding
198+
199+
The number of characters to pad `LegacySemVer` to in the `LegacySemVerPadded`
200+
[variable][variables]. Default is `4`, which will pad the `LegacySemVer` value
201+
of `3.0.0-beta1` to `3.0.0-beta0001`.
202+
203+
### build-metadata-padding
204+
205+
The number of characters to pad `BuildMetaData` to in the `BuildMetaDataPadded`
206+
[variable][variables]. Default is `4`, which will pad the `BuildMetaData` value
207+
of `1` to `0001`.
208+
209+
### commits-since-version-source-padding
210+
211+
The number of characters to pad `CommitsSinceVersionSource` to in the
212+
`CommitsSinceVersionSourcePadded` [variable][variables]. Default is `4`, which
213+
will pad the `CommitsSinceVersionSource` value of `1` to `0001`.
196214

197215
### tag-pre-release-weight
198216

@@ -329,24 +347,39 @@ branches:
329347
feature:
330348
regex: ^features?[/-]
331349
mode: ContinuousDelivery
332-
tag: '{BranchName}'
350+
tag: useBranchName
333351
increment: Inherit
352+
prevent-increment-of-merged-branch-version: false
353+
track-merge-target: false
334354
source-branches: [ 'develop', 'main', 'release', 'feature', 'support', 'hotfix' ]
335-
pre-release-weight: 30000
355+
tracks-release-branches: false
356+
is-release-branch: false
357+
is-mainline: false
358+
pre-release-weight: 30000
336359
pull-request:
337360
regex: ^(pull|pull\-requests|pr)[/-]
338361
mode: ContinuousDelivery
339362
tag: PullRequest
340363
increment: Inherit
364+
prevent-increment-of-merged-branch-version: false
341365
tag-number-pattern: '[/-](?<number>\d+)[-/]'
366+
track-merge-target: false
342367
source-branches: [ 'develop', 'main', 'release', 'feature', 'support', 'hotfix' ]
368+
tracks-release-branches: false
369+
is-release-branch: false
370+
is-mainline: false
343371
pre-release-weight: 30000
344372
hotfix:
345373
regex: ^hotfix(es)?[/-]
346374
mode: ContinuousDelivery
347375
tag: beta
348-
increment: Inherit
349-
source-branches: [ 'release', 'main', 'support', 'hotfix' ]
376+
increment: Patch
377+
prevent-increment-of-merged-branch-version: false
378+
track-merge-target: false
379+
source-branches: [ 'develop', 'main', 'support' ]
380+
tracks-release-branches: false
381+
is-release-branch: false
382+
is-mainline: false
350383
pre-release-weight: 30000
351384
support:
352385
regex: ^support[/-]
@@ -510,7 +543,7 @@ branches:
510543

511544
Strategy which will look for tagged merge commits directly off the current
512545
branch. For example `develop` → `release/1.0.0` → merge into `main` and tag
513-
`1.0.0`. The tag is _not_ on develop, but develop should be version `1.0.0` now.
546+
`1.0.0`. The tag is *not* on develop, but develop should be version `1.0.0` now.
514547

515548
### tracks-release-branches
516549

@@ -539,19 +572,6 @@ is set, it would be added to the `PreReleaseNumber` to get a final
539572
`pre-release-weight` will be used in the calculation. Related Issues [1145][1145]
540573
and [1366][1366].
541574

542-
### semver-format
543-
544-
Specifies the semver format that is used when parsing the string.
545-
Can be `Strict` - using the [regex](https://regex101.com/r/Ly7O1x/3/)
546-
or `Loose` the old way of parsing. The default if not specified is `Strict`
547-
Example of invalid `Strict`, but valid `Loose`
548-
549-
```
550-
1.2-alpha4
551-
01.02.03-rc03
552-
1.2.3.4
553-
```
554-
555575
[1145]: https://github.com/GitTools/GitVersion/issues/1145
556576
[1366]: https://github.com/GitTools/GitVersion/issues/1366
557577
[2506]: https://github.com/GitTools/GitVersion/pull/2506#issuecomment-754754037

0 commit comments

Comments
 (0)