This is an automated email from the ASF dual-hosted git repository.
raulcd pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new 4070a2fb98c GH-50811: [Release] Use maint-Major.Minor.x for patch
releases as the maintenance branch on required release scripts (#50813)
4070a2fb98c is described below
commit 4070a2fb98caf9fa8f2f92b107fe87aba0d0f5a8
Author: Raúl Cumplido <[email protected]>
AuthorDate: Thu Aug 6 09:50:58 2026 +0200
GH-50811: [Release] Use maint-Major.Minor.x for patch releases as the
maintenance branch on required release scripts (#50813)
### Rationale for this change
When working with patch releases currently the maintenance branch used is
not correct and the scripts for 02-source and 03-binary fail to create the PR
or find it.
### What changes are included in this PR?
Use the correct maintenance branch format taking into account the
differences between major releases and patch releases.
Updated release documentation to make it clearer that only the
`maint-X.Y.x` branch is used for patch releases.
### Are these changes tested?
Yes, as I had to cut RC1 for the 25.0.1 release I've been able to validate
that they work as expected now.
### Are there any user-facing changes?
No
* GitHub Issue: #50811
Lead-authored-by: Raúl Cumplido <[email protected]>
Co-authored-by: tadeja <[email protected]>
Signed-off-by: Raúl Cumplido <[email protected]>
---
dev/release/02-source.sh | 11 ++++++++++-
dev/release/03-binary-submit.sh | 10 +++++++++-
docs/source/developers/release.rst | 38 +++++++++++++++++++++-----------------
3 files changed, 40 insertions(+), 19 deletions(-)
diff --git a/dev/release/02-source.sh b/dev/release/02-source.sh
index 1fe0adcac2e..4c7b8cabf37 100755
--- a/dev/release/02-source.sh
+++ b/dev/release/02-source.sh
@@ -40,7 +40,16 @@ rc=$2
. "${SOURCE_DIR}/utils-env.sh"
tag=apache-arrow-${version}-rc${rc}
-maint_branch=maint-${version}
+
+patch_version=$(echo ${version} | cut -d. -f3)
+if [ "${patch_version}" -eq 0 ]; then
+ maint_branch="maint-${version}"
+else
+ # Patch releases use the maint-Major.Minor.x branch.
+ major_minor_version=$(echo ${version} | cut -d. -f1-2)
+ maint_branch="maint-${major_minor_version}.x"
+fi
+
rc_branch="release-${version}-rc${rc}"
rc_url="https://dist.apache.org/repos/dist/dev/arrow/${tag}";
diff --git a/dev/release/03-binary-submit.sh b/dev/release/03-binary-submit.sh
index acd0af5be49..741234477f8 100755
--- a/dev/release/03-binary-submit.sh
+++ b/dev/release/03-binary-submit.sh
@@ -34,7 +34,15 @@ version_with_rc="${version}-rc${rc}"
crossbow_job_prefix="release-${version_with_rc}"
release_tag="apache-arrow-${version}-rc${rc}"
rc_branch="release-${version_with_rc}"
-maint_branch="maint-${version}"
+
+patch_version=$(echo ${version} | cut -d. -f3)
+if [ "${patch_version}" -eq 0 ]; then
+ maint_branch="maint-${version}"
+else
+ # Patch releases use the maint-Major.Minor.x branch.
+ major_minor_version=$(echo ${version} | cut -d. -f1-2)
+ maint_branch="maint-${major_minor_version}.x"
+fi
: ${ARROW_REPOSITORY:="apache/arrow"}
: ${ARROW_BRANCH:=${release_tag}}
diff --git a/docs/source/developers/release.rst
b/docs/source/developers/release.rst
index 0ca65d26414..fbce61ae9d1 100644
--- a/docs/source/developers/release.rst
+++ b/docs/source/developers/release.rst
@@ -148,11 +148,15 @@ Follow up Release Candidates will update the maintenance
branch by cherry-pickin
specific commits.
For the initial Release Candidate for a minor or a patch release we will create
-a maintenance branch from the previous corresponding release. For example,
-for a 15.0.1 patch we will create a maint-15.0.1 branch from maint-15.0.0 and
for
-a maint-15.0.2 we will create it from maint-15.0.1. Once the maintenance
branch is
-created we will update the created maintenance branch by cherry-picking
specific
-commits.
+a maintenance branch from the previous corresponding release tag. For example,
+for a 25.0.1 patch we will create the maintenance branch from the
+``apache-arrow-25.0.0``. This is automatically done by ``archery release
cherry-pick``.
+The maintenance branch is named after the release series, not after the exact
version being
+released, for example for patch release (``25.0.1``) the maintenance branch
will be
+``maint-25.0.x``.
+
+If further patch releases are prepared, i.e., 25.0.2 it will be created on the
same
+``maint-25.0.x`` branch.
Create or update the corresponding maintenance branch
-----------------------------------------------------
@@ -164,12 +168,12 @@ Create or update the corresponding maintenance branch
.. code-block::
# Execute the following from an up to date main branch.
- # This will create a branch locally called maint-X.Y.Z.
+ # This will create the maintenance branch locally.
# X.Y.Z corresponds with the Major, Minor and Patch version number
# of the release respectively. As an example 9.0.0
archery release cherry-pick X.Y.Z --execute
# Push the maintenance branch to the remote repository
- git push -u upstream maint-X.Y.Z
+ git push -u upstream <maintenance-branch>
.. tab-item:: Follow up Release Candidates
@@ -182,7 +186,7 @@ Create or update the corresponding maintenance branch
# Update the maintenance branch with the previous commits
archery release cherry-pick X.Y.Z --continue --execute
# Push the updated maintenance branch to the remote repository
- git push -u upstream maint-X.Y.Z
+ git push -u upstream <maintenance-branch>
Optional: Test Before Creating a Release Candidate
--------------------------------------------------
@@ -193,8 +197,8 @@ a given release.
To test before creating a release candidate:
-* Create a pull request from the up-to-date maint-X.Y.Z branch onto main
-* Title the pull request "WIP: Dummy PR to check maint-X.Y.Z status"
+* Create a pull request from the up-to-date ``<maintenance-branch>`` onto main
+* Title the pull request "WIP: Dummy PR to check <maintenance-branch> status"
* Comment on the pull request to trigger the relevant Crossbow jobs:
* ``@github-actions crossbow submit --group verify-rc-source``
@@ -206,7 +210,7 @@ Create the Release Candidate branch from the updated
maintenance branch
.. code-block::
# Start from the updated maintenance branch.
- git checkout maint-X.Y.Z
+ git checkout <maintenance-branch>
# The following script will create a branch for the Release Candidate,
# place the necessary commits updating the version number and then create
a git tag
@@ -337,16 +341,16 @@ Be sure to go through on the following checklist:
:class-title: sd-fs-5
:class-container: sd-shadow-md
- Merge ``release-X.Y.Z-rcN`` to ``maint-X.Y.Z``:
+ Merge ``release-X.Y.Z-rcN`` to ``maint-X.Y.x``:
.. code-block:: Bash
- # git checkout maint-10.0.0
- git checkout maint-X.Y.Z
- # git merge release-10.0.0-rc0
+ # git checkout maint-25.0.x
+ git checkout maint-X.Y.x
+ # git merge release-25.0.1-rc0
git merge release-X.Y.Z-rcN
- # git push -u upstream maint-10.0.0
- git push -u upstream maint-X.Y.Z
+ # git push -u upstream maint-25.0.x
+ git push -u upstream maint-X.Y.x
.. dropdown:: Add the new release to the Apache Reporter System
:animate: fade-in-slide-down
