Skip to content

Commit 6f9c4b6

Browse files
committed
Merge branch 'stable'
2 parents 081ba72 + a139be9 commit 6f9c4b6

File tree

2 files changed

+20
-9
lines changed

2 files changed

+20
-9
lines changed

.github/workflows/release.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,16 @@ jobs:
5959
with:
6060
setAllVars: true
6161

62+
- name: ⚙️ Calculate x.y.z version
63+
run: echo "{SIMPLE_VERSION}=$((NBGV_VersionMajor)).$((NBGV_VersionMinor)).$((NBGV_BuildNumber+1))" >> $GITHUB_ENV
64+
65+
- run: echo "$SIMPLE_VERSION"
66+
6267
- name: ⚙️ Setup dotnet 5.0.x
6368
uses: actions/setup-dotnet@v1
6469
with:
6570
dotnet-version: '5.0.x'
6671

67-
- name: 🛠️ Building library in release mode
68-
run: dotnet pack src/ -c release -p:ContinuousIntegrationBuild=true
69-
70-
- name: 🛠️ Upload library to NuGet.org repository
71-
run: echo "TODO"
72-
7372
- name: 🛠️ Update changelog
7473
uses: thomaseizinger/[email protected]
7574
with:
@@ -85,10 +84,16 @@ jobs:
8584
run: |
8685
git add CHANGELOG.md
8786
git commit -S -m "Updated CHANGELOG.md for ${{ env.NBGV_SimpleVersion }} release"
88-
git push origin stable
8987
90-
- name: ⏩ Merge stable with main
88+
- name: 🛠️ Building library in release mode
89+
run: dotnet pack src/ -c release -p:ContinuousIntegrationBuild=true
90+
91+
- name: 🛠️ Upload library to NuGet.org repository
92+
run: echo "TODO"
93+
94+
- name: ⏩ Merge stable with main, push both
9195
run: |
96+
git push origin stable
9297
git checkout main
9398
git merge -S stable
9499
git push origin main

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [1.20.16] - 2021-04-24
11+
12+
foo bar baz
13+
1014
## [1.20.13] - 2021-04-24
1115

1216
second test
@@ -84,7 +88,9 @@ more of that
8488

8589
- Something was added.
8690

87-
[Unreleased]: https://github.com/bUnit-dev/workflows/compare/v1.20.13...HEAD
91+
[Unreleased]: https://github.com/bUnit-dev/workflows/compare/v1.20.16...HEAD
92+
93+
[1.20.16]: https://github.com/bUnit-dev/workflows/compare/v1.20.13...v1.20.16
8894

8995
[1.20.13]: https://github.com/bUnit-dev/workflows/compare/v1.19.6...v1.20.13
9096

0 commit comments

Comments
 (0)