Skip to content

Commit aa2a8d6

Browse files
committed
minorly tweak RELEASING
`./dist.py # on the 'release' branch` passes `# on the 'release' branch` to `./dist.py`.
1 parent 3ade67e commit aa2a8d6

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

RELEASING

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
Push new release branch:
2-
1. make sure branches 'main' and 'release' are synced up locally
2+
1. make sure branches 'main' and 'release' are synced up locally, check out main
33
2. update kDemumbleVersion in demumble.cc with new version (with ".git"), then
44
git commit -am 'mark this 1.0.0.git'
55
3. git checkout release; git merge main
66
4. fix version number in src/version.cc (it will conflict in the above)
77
5. commit, tag, push (don't forget to push --tags), build binaries
8+
# on the 'release' branch
89
git commit -am v1.0.0; git push origin release
910
git tag v1.0.0; git push --tags
10-
./dist.py # on the 'release' branch
11+
./dist.py
1112
# Push the 1.0.0.git change on main too:
1213
git checkout main; git push origin main
1314
6. add demumble-{linux,mac,win}.zip to https://github.com/nico/demumble/releases

0 commit comments

Comments
 (0)