Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

doc: update release procedure (merge the latest release to the release branch)

Browse source 
- ref. https://github.com/shaarli/Shaarli/pull/1959
This commit is contained in:
nodiscc 2023-03-20 18:08:02 +01:00
parent 6624f00c05
commit 062698c123
No known key found for this signature in database
GPG key ID: 067FC4266A4B6909
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/md/dev/Release-Shaarli.md
View file

@ -139,16 +139,16 @@ make release_archive
This will create `shaarli-v0.x.y-full.tar`, `shaarli-v0.x.y-full.zip`. These archives need to be manually uploaded on the previously created GitHub [release](https://github.com/shaarli/Shaarli/releases). This will create `shaarli-v0.x.y-full.tar`, `shaarli-v0.x.y-full.zip`. These archives need to be manually uploaded on the previously created GitHub [release](https://github.com/shaarli/Shaarli/releases).
### Update the `latest` branch ### Update the `release` branch
```bash ```bash
# checkout the 'latest' branch # checkout the 'release' branch
git checkout latest git checkout release
# merge changes from your newly published release branch # merge changes from your newly published release branch
git merge v0.x.y git merge v0.x.y
# fix eventual conflicts with git mergetool... # fix eventual conflicts with git mergetool...
# run tests # run tests
make test make test
# push the latest branch # push the latest branch
git push upstream latest git push upstream release
``` ```