Skip to content

Commit 8293ccf

Browse files
committed
More fixes to continuous-delivery
1 parent 91f8a9a commit 8293ccf

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

docs/configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ The global configuration options are:
2424

2525
- **`assembly-informational-format:`** Set this to any of the available [variables](/more-info/variables) to change the value of the `AssemblyInformationalVersion` attribute. Default set to `{InformationalVersion}`. It also supports string interpolation (`{MajorMinorPatch}+{Branch}`)
2626

27-
- **`mode:`** Sets the mode of how GitVersion should create a new version. Read more at [versioning mode](/reference/versioning-mode)
27+
- **`mode:`** Sets the mode of how GitVersion should create a new version. Read more at [versioning mode](/reference/versioning-mode.md).
2828

2929
- **`continuous-delivery-fallback-tag:`** When using `mode: ContinuousDeployment`, the value specified will be used as the pre-release tag for branches which do not have one specified. Default set to `ci`.
3030

docs/reference/continuous-delivery.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ you have deployed into production.
1111
In essence continuous delivery means:
1212

1313
- Your code is automatically built and tested
14-
- If any of the automated tests fail, the teams #1 priority is to fix the build
14+
- If any of the automated tests fail, the team's #1 priority is to fix the
15+
build
1516
- If the build is green, the application can be deployed at any time
1617
- Ideally the business should make that decision
1718
- The same artifacts which were built and tested should be deployed
@@ -27,20 +28,21 @@ GitHubFlow is a better fit for Continuous delivery, the
2728
feature branch will be built as a *stable* version and if the build/builds go
2829
green then you are free to deploy to production at any time.
2930

30-
## How continuous delivery affects GitVersion
31+
## Usage
32+
By default, GitVersion is set up to do Continuous Delivery on all branches but
33+
`develop`, which is set up with [Continuous Deployment](continuous-deployment.md).
34+
To change the mode to Continuous Delivery, change your
35+
[configuration](../configuration.md) to:
36+
37+
```yaml
38+
mode: ContinuousDelivery
39+
```
40+
41+
## How Continuous Delivery affects GitVersion
3142
The thing about continuous delivery is that there will be *multiple* candidates
3243
to deploy to production and it is a human choice to deploy. This means that
3344
GitVersion will build **the same semantic version** until that version is
34-
deployed.
35-
36-
GitVersion assumes Continuous Delivery by default in its
37-
[configuration](../configuration.md), if you want to do
38-
[continuous deployment](continuous-deployment.md) then just change the
39-
configuration setting.
40-
41-
## Example
42-
In Continuous Delivery, GitVersion calculates the next version and will use that
43-
until it is released. For instance:
45+
deployed. For instance:
4446
4547
- 1.1.0+5
4648
- 1.1.0+6
@@ -53,6 +55,4 @@ an external manual process.
5355
5456
## Resources
5557
- [Continuous Delivery on Uncyclopedia](https://en.wikipedia.org/wiki/Continuous_delivery)
56-
- [Continuous Delivery, the book](http://www.amazon.com/Continuous-Delivery-Deployment-Automation-Addison-Wesley/dp/0321601912)
57-
58-
58+
- [Continuous Delivery, the book](http://www.amazon.com/Continuous-Delivery-Deployment-Automation-Addison-Wesley/dp/0321601912)

0 commit comments

Comments
 (0)