Skip to content

Commit 19bec64

Browse files
committed
Merge pull request #699 from pascalberger/DocFixes3
More broken document links fixing
2 parents 48c7b1a + e839b0d commit 19bec64

File tree

14 files changed

+23
-23
lines changed

14 files changed

+23
-23
lines changed

docs/build-server-support/build-server/octopus-deploy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Octopus Deploy
22
While not a build server, there are a few things to consider when using Octopus Deploy with GitVersion.
33

4-
GitVersion follows [continuous delivery](/reference/continuous-delivery.md) versioning by default. This means builds will keep producing *the same version* with just metadata differing. For example, when you start a new release (say `1.0.0`) with git flow, the branch will start with a semver like `1.0.0-beta.1+0`, and the Octopus NuGet package will have a version of `1.0.0-beta0001`. As you commit changes to this release branch the *metadata* of the semver will increase like so: `1.0.0-beta.1+1`, `1.0.0-beta.1+2`, etc. However, the version of the corresponding Octopus NuGet package will retain the *same* `1.0.0-beta0001` version you started with. The problem is Octopus Deploy will prevent you from deploying these revisions because it sees the same NuGet package version and thinks nothing has changed.
4+
GitVersion follows [continuous delivery](../../reference/continuous-delivery.md) versioning by default. This means builds will keep producing *the same version* with just metadata differing. For example, when you start a new release (say `1.0.0`) with git flow, the branch will start with a semver like `1.0.0-beta.1+0`, and the Octopus NuGet package will have a version of `1.0.0-beta0001`. As you commit changes to this release branch the *metadata* of the semver will increase like so: `1.0.0-beta.1+1`, `1.0.0-beta.1+2`, etc. However, the version of the corresponding Octopus NuGet package will retain the *same* `1.0.0-beta0001` version you started with. The problem is Octopus Deploy will prevent you from deploying these revisions because it sees the same NuGet package version and thinks nothing has changed.
55

66
Because Octopus Deploy uses NuGet like this you cannot continue to push revisions in this manner without some intervention (or changes to GitVersion's configuration). To work around this problem we have two possible options:
77

@@ -34,5 +34,5 @@ The following shows an example with the corresponding git commands:
3434

3535
This approach works well with Semantic Versioning, as you will not be burning version numbers between releases (except if a build fails to get through UAT or something, then the burnt number means something!).
3636

37-
### Configure GitVersion to [increment per commit](/more-info/incrementing-per-commit.md)
37+
### Configure GitVersion to [increment per commit](../../more-info/incrementing-per-commit.md)
3838
As mentioned above, this means you will burn multiple versions per release. This might not be an issue for you, but can confuse consumers of your library as the version has semantic meaning.

docs/build-server-support/build-server/teamcity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ TeamCity has support for meta-runners which allow custom tasks. There is a GitVe
1818

1919
## Running inside TeamCity
2020
* Make sure to use **agent checkouts** (required, server checkouts do not copy the needed `.git` directory)
21-
- If you want to use *checkout on server*, see [dynamic repositories](/more-info/dynamic-repositories.md)
21+
- If you want to use *checkout on server*, see [dynamic repositories](../../more-info/dynamic-repositories.md)
2222
* For the moment you need to promote the `%teamcity.build.vcs.branch.{configurationid}%` build parameter to an environment variable with the same name for pull requests to be handled correctly
2323
* We update the TC build number to the GitVersion number automatically
2424
* We output the individual values of the GitVersion version as the build parameter: `GitVersion.*` (Eg: `GitVersion.Major`) if you need access to them in your build script

docs/examples.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ This is just a small sample of the way GitVersion works. The idea is you just pl
2727
If you have other branch types GitVersion is entirely configuration driven, so check out the [Configuration](configuration.md) section of the readme to understand how to make GitVersion work for you.
2828

2929
## GitFlow
30-
[See GitFlow Examples](/git-branching-strategies/gitflow-examples.md)
30+
[See GitFlow Examples](git-branching-strategies/gitflow-examples.md)
3131

3232
## GitHubFlow
33-
[See GitHubFlow Examples](/git-branching-strategies/githubflow-examples.md)
33+
[See GitHubFlow Examples](git-branching-strategies/githubflow-examples.md)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# GitFlow Examples
2-
These examples are using the *default* configuration with GitVersion. Which is [continuous deployment](/reference/continuous-deployment.md) mode for `develop` and [continuous delivery](../reference/continuous-delivery.md) mode for all other branches.
2+
These examples are using the *default* configuration with GitVersion. Which is [continuous deployment](../reference/continuous-deployment.md) mode for `develop` and [continuous delivery](../reference/continuous-delivery.md) mode for all other branches.
33

44
This default configuration allows you to publish CI builds from develop to a CI MyGet feed, or another CI feed. Then all other branches are manually released then tagged. Read more about this at [version increments](../more-info/version-increments.md).
55

docs/git-branching-strategies/githubflow.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ GitHub Flow is a simple and effective branching strategy which the folks at GitH
33

44
GitHub Flow is in a nutshell:
55

6-
1. Update master to latest [upstream](/reference/git-setup.md#upstream) code
6+
1. Update master to latest [upstream](../reference/git-setup.md#upstream) code
77
1. Create a feature branch `git checkout -b myFeatureBranch`
88
1. Do the feature/work
9-
1. Push feature branch to [origin](/reference/git-setup.md#origin)
9+
1. Push feature branch to [origin](../reference/git-setup.md#origin)
1010
1. Create pull request from origin/<featureBranch> -> upstream/master
1111
1. Review, fix raised comments, merge your PR or even better, get someone else to.
1212

13-
The main rule of GitHub Flow is that master should *always* be deployable. GitHub Flow allows and encourages [continuous delivery](/reference/continuous-delivery.md).
13+
The main rule of GitHub Flow is that master should *always* be deployable. GitHub Flow allows and encourages [continuous delivery](../reference/continuous-delivery.md).
1414

1515
## Resources
1616
- [GitHubFlow guide by GitHub](https://guides.github.com/introduction/flow/index.html)

docs/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ If a commit is tagged, then GitVersion will *always* use that version over any c
1010
### The Semantic Version does not increment every commit
1111
This trips a lot of people up, by default GitVersion *does not* increment the SemVer every commit. This means that you will get multiple builds producing the *same version* of your application.
1212

13-
Read more at [version increments](/more-info/version-increments.md)
13+
Read more at [version increments](more-info/version-increments.md)
1414

1515
### Version sources
1616
There are a number of sources GitVersion can get it's versions from, they include:
@@ -21,7 +21,7 @@ There are a number of sources GitVersion can get it's versions from, they includ
2121
- Track version of another branch (i.e develop tracks master, so when master increments so does develop)
2222
- GitVersionConfig.yaml file (i.e `next-version: 2.0.0`)
2323

24-
Read more at [version sources](/more-info/version-sources.md)
24+
Read more at [version sources](more-info/version-sources.md)
2525

2626
## Configuration
2727
GitVersion v3 was rewritten to be very configuration driven rather than hardcoding git workflows into it. This has made it a lot more flexible. Configuration options can be set globally or per branch.
@@ -36,4 +36,4 @@ You can just run `GitVersion.exe` in your repository to see what variables are a
3636
## Exe or MSBuild Task
3737
There are two ways to consume GitVersion, the first is by running GitVersion.exe. The second is an MSBuild task. The MSBuild task is really easy to get up and running, simply install GitVersionTask from NuGet and it will integrate into your project and write out variables to your build server if it's running on one. The exe offers more options and works for not just .net projects.
3838

39-
Read more about [using GitVersion](/usage/usage.md)
39+
Read more about [using GitVersion](usage/usage.md)

docs/more-info/how-it-works.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# How it works
22
GitVersion v3 works very differently to v2. Version 2 had knowledge of both GitFlow and GitHubFlow hard coded into it, with each branch having it's own class which calculated the version for that branch type.
33

4-
v3 is driven by [configuration](/configuration.md), meaning most of the behaviors in GitVersion can be tweaked to work the way you want. It also makes it *much* more predictable and easy to diagnose why odd things are happening.
4+
v3 is driven by [configuration](../configuration.md), meaning most of the behaviors in GitVersion can be tweaked to work the way you want. It also makes it *much* more predictable and easy to diagnose why odd things are happening.
55

66
## Architecture
77
GitVersion has three distict steps for calculating versions in v3.0.

docs/more-info/version-increments.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ If you are using GitFlow then builds off the `develop` branch will actually *inc
1717
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 pacakges.
1818

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

2222
## Manually incrementing the version
2323
With v3 there are multiple approaches.

docs/reference/continuous-deployment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ Continuous deployment is the process of checking into master, running all the te
33

44
By default GitVersion is *not* setup to do this. The good news is in v3 of GitVersion this behavior is configurable!
55

6-
The default behavior for v3 and how v1 & 2 worked was that the version only incremented after a tag, which signified a release. In v3 you can simply switch the default mode in the [configuration](/configuration.md) from `continuous-delivery` to `continuous-deployment` and the version will then increment each commit, giving you the features of GitVersion with continuous deployment.
6+
The default behavior for v3 and how v1 & 2 worked was that the version only incremented after a tag, which signified a release. In v3 you can simply switch the default mode in the [configuration](../configuration.md) from `continuous-delivery` to `continuous-deployment` and the version will then increment each commit, giving you the features of GitVersion with continuous deployment.

docs/reference/intro-to-semver.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ For a more complete explaination checkout [semver.org](http://semver.org) which
2424
## SemVer in GitVersion
2525
GitVersion makes it easy to follow semantic versioning in your library by automatically calculating the next semantic version which your library/application is likely to use. In GitFlow the develop branch will bump the *minor* when master is tagged, while GitHubFlow will bump the *patch*.
2626

27-
Because one side does not always fit all, GitVersion provides many [Variables](/more-info/variables.md) for you to use which contain different variations of the version. For example SemVer will be in the format {major}.{minor}.{patch}-{tag}, but FullSemVer will also include build metadata: {major}.{minor}.{patch}-{tag}+{buildmetadata}
27+
Because one side does not always fit all, GitVersion provides many [Variables](../more-info/variables.md) for you to use which contain different variations of the version. For example SemVer will be in the format {major}.{minor}.{patch}-{tag}, but FullSemVer will also include build metadata: {major}.{minor}.{patch}-{tag}+{buildmetadata}

0 commit comments

Comments
 (0)