From 329c67b1dbd47af931c4deb2e31df1d1873409c7 Mon Sep 17 00:00:00 2001 From: teroneko Date: Tue, 7 Jan 2020 03:44:25 +0000 Subject: [PATCH 1/3] Documentation enhanced concerning issue #888 (https://github.com/GitTools/GitVersion/issues/888) --- docs/input/docs/configuration.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/input/docs/configuration.md b/docs/input/docs/configuration.md index d127a9961d..ecccad9894 100644 --- a/docs/input/docs/configuration.md +++ b/docs/input/docs/configuration.md @@ -137,6 +137,16 @@ When using `mode: ContinuousDeployment`, the value specified in `continuous-delivery-fallback-tag` will be used as the pre-release tag for branches which do not have one specified. Default set to `ci`. +Just to clarify: For a build name without "...-ci-" or in other +words without a PreReleaseTag (ergo "PreReleaseTag":"" when typing GitVersion) +at the end you would need to set continuous-delivery-fallback-tag to '': +``` +mode: ContinuousDeployment +continuous-delivery-fallback-tag: '' +... +``` +Doing so can be applicable if you use your master branch as release branch. + ### tag-prefix A regex which is used to trim git tags before processing (eg v1.0.0). Default is From aca18fc320fb065c766c73597cc67d3610d09bd7 Mon Sep 17 00:00:00 2001 From: teroneko Date: Tue, 7 Jan 2020 03:55:15 +0000 Subject: [PATCH 2/3] Content has been escaped to \ --- docs/input/docs/configuration.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/input/docs/configuration.md b/docs/input/docs/configuration.md index ecccad9894..dd5df067d5 100644 --- a/docs/input/docs/configuration.md +++ b/docs/input/docs/configuration.md @@ -137,15 +137,17 @@ When using `mode: ContinuousDeployment`, the value specified in `continuous-delivery-fallback-tag` will be used as the pre-release tag for branches which do not have one specified. Default set to `ci`. -Just to clarify: For a build name without "...-ci-" or in other -words without a PreReleaseTag (ergo "PreReleaseTag":"" when typing GitVersion) -at the end you would need to set continuous-delivery-fallback-tag to '': -``` +Just to clarify: For a build name without "...-ci-\" or in other +words without a `PreReleaseTag` (ergo `"PreReleaseTag":""` in GitVersion's JSON output) +at the end you would need to set `continuous-delivery-fallback-tag` to an empty string (`''`): + +```yaml mode: ContinuousDeployment continuous-delivery-fallback-tag: '' ... ``` -Doing so can be applicable if you use your master branch as release branch. + +Doing so can be helpful if you use your `master` branch as a `release` branch. ### tag-prefix From ba693afaa2972f1b377d6f52e53a6b5a187e851d Mon Sep 17 00:00:00 2001 From: teroneko Date: Tue, 7 Jan 2020 09:43:59 +0000 Subject: [PATCH 3/3] Apply change suggestion `...-ci-` in favour of "...-ci-\" --- docs/input/docs/configuration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/input/docs/configuration.md b/docs/input/docs/configuration.md index dd5df067d5..ce8ee037c2 100644 --- a/docs/input/docs/configuration.md +++ b/docs/input/docs/configuration.md @@ -137,7 +137,7 @@ When using `mode: ContinuousDeployment`, the value specified in `continuous-delivery-fallback-tag` will be used as the pre-release tag for branches which do not have one specified. Default set to `ci`. -Just to clarify: For a build name without "...-ci-\" or in other +Just to clarify: For a build name without `...-ci-` or in other words without a `PreReleaseTag` (ergo `"PreReleaseTag":""` in GitVersion's JSON output) at the end you would need to set `continuous-delivery-fallback-tag` to an empty string (`''`):