OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docs/releasing: update branchpoint instructions to be friendlier to our Marge-bot-based workflow

Browse Source 
Signed-off-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19536>
This commit is contained in:
Eric Engestrom
2022-11-04 15:52:53 +00:00
committed by Marge Bot
parent fa10735da3
commit 739ecdf367
1 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
docs/releasing.rst
View File

@@ -175,26 +175,39 @@ to stabilization and bugfixing.
testing is done and there are little to-no issues. Ideally all of those testing is done and there are little to-no issues. Ideally all of those
should be tackled already. should be tackled already.
To setup the branchpoint: Setup the branchpoint:
.. code-block:: console .. code-block:: console
git fetch origin # make sure we have the latest commits
git checkout main # make sure we're on main
git reset origin # make sure we're at the latest commit
VERSION=X.Y
git tag -s $VERSION-branchpoint -m "Mesa $VERSION branchpoint"
# Make sure main can carry on at the new version # Make sure main can carry on at the new version
$EDITOR VERSION # bump the version number, keeping in mind the wrap around at the end of the year $EDITOR VERSION # bump the version number, keeping in mind the wrap around at the end of the year
git commit -asm 'VERSION: bump to X.(Y+1)' git commit -asm 'VERSION: bump to X.(Y+1)'
truncate -s0 docs/relnotes/new_features.txt truncate -s0 docs/relnotes/new_features.txt
git commit -asm 'docs: reset new_features.txt' git commit -asm 'docs: reset new_features.txt'
git push origin main git push YOUR_FORK
Make a merge request with what you just pushed, and assign it straight
to ``@Marge-bot``. Keep an eye on it, as you'll need to wait for it to
be merged.
Once it has been merged, note the last commit *before* your "VERSION:
bump to X.Y" as this is the branchpoint. This is ``$LAST_COMMIT`` in the
command below:
.. code-block:: console
VERSION=X.Y
git tag -s $VERSION-branchpoint -m "Mesa $VERSION branchpoint" $LAST_COMMIT
# Double-check that you tagged the correct commit
git show $VERSION-branchpoint
Now that we have an official branchpoint, let's push the tag and create
the branches:
.. code-block:: console
# Create the tag and branches on the server
git push origin $VERSION-branchpoint git push origin $VERSION-branchpoint
git checkout $VERSION-branchpoint git checkout $VERSION-branchpoint
git push origin HEAD:refs/heads/$VERSION git push origin HEAD:refs/heads/$VERSION