yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-03 06:09:16 +02:00
Code Issues Releases Wiki Activity

Start process to get rid of master branch

Browse source
This commit is contained in:
Georg Krause 2021-09-21 13:36:16 +02:00
parent e5b95c82a4
commit e96d2dab10
No known key found for this signature in database
GPG key ID: FD479B9A4D48E632
7 changed files with 25 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CONTRIBUTING.rst
View file

@ -100,7 +100,7 @@ Visit https://dev.funkwhale.audio/funkwhale/funkwhale and clone the repository u
A note about branches
^^^^^^^^^^^^^^^^^^^^^
Next release development occurs on the "develop" branch, and releases are made on the "master" branch. Therefore, when submitting Merge Requests, ensure you are merging on the develop branch.
Next release development occurs on the "develop" branch, and releases are made on the "stable" branch. Therefore, when submitting Merge Requests, ensure you are merging on the develop branch.
Working with docker
@ -750,7 +750,7 @@ To make a new 3.4 release::
export PREVIOUS_RELEASE=3.3 # replace with the previous release number
# ensure you have an up-to-date repo
git checkout develop # use master if you're doing a hotfix release
git checkout develop # use stable if you're doing a hotfix release
git pull
# compile changelog
@ -775,11 +775,11 @@ To make a new 3.4 release::
# publish
git push --tags && git push
# if you're doing a hotfix release from master
git checkout develop && git merge master && git push
# if you're doing a hotfix release from stable
git checkout develop && git merge stable && git push
# if you're doing a non-hotfix release, and a real release (not a real release) from develop
git checkout master && git merge develop && git push
git checkout stable && git merge develop && git push
Then, visit https://dev.funkwhale.audio/funkwhale/funkwhale/-/tags, copy-paste the changelog on the corresponding
tag, and announce the good news ;)