Skip to content

Commit 2f591de

Browse files
author
Pascal Berger
committed
Update documentation to use alpha prefix
1 parent e1f3576 commit 2f591de

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

docs/git-branching-strategies/gitflow-examples.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Feature branches will take the feature branch name and use that as the pre-relea
88

99
![GitFlow](img/05119d0cd4ecaaefff94_feature-branch.png)
1010

11-
Notice after the feature branch is merged, the version on `develop` is `1.3.0-unstable.3`. This is due to `develop` running in *continuous deployment* mode. If you configured `develop` to use *continuous delivery* the version would still be `1.3.0-unstable.1` and you would have to use release tags to increment the `unstable.1`.
11+
Notice after the feature branch is merged, the version on `develop` is `1.3.0-alpha.3`. This is due to `develop` running in *continuous deployment* mode. If you configured `develop` to use *continuous delivery* the version would still be `1.3.0-alpha.1` and you would have to use release tags to increment the `alpha.1`.
1212

1313
You can see the different on the feature branch itself, notice the version is the same before and after the commit on the feature branch? Only the metadata has changed. If you released the feature branch artifacts then tagged the commit, the following commit would increase to `-beta.2`.
1414

docs/git-branching-strategies/gitflow.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ Long version:
5252
* major: `masterMergeVersion.Major`
5353
* minor: `masterMergeVersion.Minor + 1` (0 if the override above is used)
5454
* patch: 0
55-
* pre-release: `unstable{n}` where n = how many commits `develop` is in front of `masterVersionCommit.Date` ('0' padded to 4 characters)
55+
* pre-release: `alpha.{n}` where n = how many commits `develop` is in front of `masterVersionCommit.Date` ('0' padded to 4 characters)
5656

5757
Long version:
5858

5959
{major}.{minor}.{patch}-{pre-release} Branch:'{branchName}' Sha:'{sha}'
60-
1.2.3-unstable645 Branch:'develop' Sha:'a682956dccae752aa24597a0f5cd939f93614509'
60+
1.2.3-alpha.645 Branch:'develop' Sha:'a682956dccae752aa24597a0f5cd939f93614509'
6161

6262
### Hotfix branches
6363

@@ -108,13 +108,13 @@ TODO: feature branches cannot start with a SemVer. to stop people from create br
108108
* major: `masterMergeVersion.Major`
109109
* minor: `masterMergeVersion.Minor + 1` (0 if the override above is used)
110110
* patch: 0
111-
* pre-release: `unstable.feature-{n}` where n = First 8 characters of the commit SHA of the first commit
111+
* pre-release: `alpha.feature-{n}` where n = First 8 characters of the commit SHA of the first commit
112112

113113

114114
Long version:
115115

116116
{major}.{minor}.{patch}-{pre-release} Branch:'{branchName}' Sha:'{sha}'
117-
1.2.3-unstable.feature-a682956d Branch:'feature1' Sha:'a682956dccae752aa24597a0f5cd939f93614509'
117+
1.2.3-alpha.feature-a682956d Branch:'feature1' Sha:'a682956dccae752aa24597a0f5cd939f93614509'
118118

119119
### Pull-request branches
120120

@@ -125,7 +125,7 @@ Branch naming convention: anything except `master`, `develop`, `release-{n}`, or
125125
* major: `masterMergeVersion.Major`
126126
* minor: `masterMergeVersion.Minor + 1` (0 if the override above is used)
127127
* patch: 0
128-
* pre-release: `unstable.pull{n}` where n = the pull request number ('0' padded to 4 characters)
128+
* pre-release: `alpha.pull{n}` where n = the pull request number ('0' padded to 4 characters)
129129

130130
## Nightly Builds
131131

docs/more-info/version-increments.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ This causes problems for people as NuGet and other package managers do not suppo
1212
There are a few ways to handle this problem depending on what your requirements are:
1313

1414
### 1. GitFlow
15-
If you are using GitFlow then builds off the `develop` branch will actually *increment on every commit*. This is known in GitVersion as *continuous deployment mode*. By default `develop` builds are tagged with the `unstable` pre-release tag. This is so they are sorted higher than release branches.
15+
If you are using GitFlow then builds off the `develop` branch will actually *increment on every commit*. This is known in GitVersion as *continuous deployment mode*. By default `develop` builds are tagged with the `alpha` pre-release tag. This is so they are sorted higher than release branches.
1616

17-
If you need to consume packages built from develop, we recommend publishing these packages to a separate NuGet feed as an alpha channel. That way you can publish beta/release candidate builds and only people who opt into the alpha feed will see the unstable packages.
17+
If you need to consume packages built from develop, we recommend publishing these packages to a separate NuGet feed as an alpha channel. That way you can publish beta/release candidate builds and only people who opt into the alpha feed will see the alpha packages.
1818

1919
### 2. Octopus deploy
2020
See [Octopus deploy](../build-server-support/build-server/octopus-deploy.md)

0 commit comments

Comments
 (0)