Skip to content

Commit e6f354f

Browse files
committed
Switch to specific release branches
1 parent 3575c21 commit e6f354f

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

CONTRIBUTING.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ The base version represents the MAJOR and MINOR parts of [SemVer](https://semver
1111
## Branches / tags
1212

1313
* `master` contains the latest sources - this is where we develop.
14-
* `release` contains the sources for the latest version on `nuget.org` - this is where we deploy from.
14+
* `release/v*` contains the sources for the respective version on `nuget.org` - this is where we deploy from.
1515
* All versions on `nuget.org` have a matching GitHub release/tag
1616

1717
### Release workflow
1818

19-
1. Create a [PR from `master` to `release`](https://github.com/System-IO-Abstractions/System.IO.Abstractions/compare/release...master?expand=1) and wait for CI to finish.
19+
1. Check out latest master branch
20+
1. Call `nbgv prepare-release` (you need [the NBGV CLI tool](https://github.com/AArnott/Nerdbank.GitVersioning/blob/master/doc/nbgv-cli.md))
21+
1. Push the newly created branch
2022
1. Inspect CI run (test results, version number)
21-
1. Merge PR and wait for deployment
2223
1. Inspect newly created package versions on NuGet.org and newly created GitHub release

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ for:
4848
skip_symbols: false
4949
artifact: /.*\.nupkg/
5050
on:
51-
branch: release
51+
branch: /release/v.*$/
5252

5353
- provider: GitHub
5454
tag: v$(appveyor_build_version)
@@ -57,4 +57,4 @@ for:
5757
auth_token:
5858
secure: Rrk1zp93EpCyxec/GXKnRnJjX7vU+ClNZEBnxbM+1j6l+C56qSV7B/fUrVsJuZYV
5959
on:
60-
branch: release
60+
branch: /release/v.*$/

version.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "4.0",
3+
"version": "4.0-alpha",
44
"assemblyVersion": {
55
"precision": "major"
66
},
77
"publicReleaseRefSpec": [
8-
"^refs/heads/release$"
8+
"^refs/heads/release/v.*$"
99
],
10+
"release": {
11+
"branchName" : "release/v{version}",
12+
"versionIncrement" : "minor",
13+
"firstUnstableTag" : "alpha"
14+
},
1015
"cloudBuild": {
1116
"buildNumber": {
1217
"enabled": true,

0 commit comments

Comments
 (0)