[arrow-adbc] branch main updated: chore(dev/release): fix instructions for subsequent RCs (#266)

[li...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

lidavidm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git


The following commit(s) were added to refs/heads/main by this push:
     new 304b922  chore(dev/release): fix instructions for subsequent RCs (#266)
304b922 is described below

commit 304b9227b18352311864a9bfe2004c824892665e
Author: David Li <li...@gmail.com>
AuthorDate: Sat Dec 24 09:36:14 2022 -0500

    chore(dev/release): fix instructions for subsequent RCs (#266)
---
 dev/release/01-prepare.sh             | 5 +++--
 docs/source/development/releasing.rst | 7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dev/release/01-prepare.sh b/dev/release/01-prepare.sh
index 62e1ce0..cdbdf43 100755
--- a/dev/release/01-prepare.sh
+++ b/dev/release/01-prepare.sh
@@ -50,14 +50,15 @@ fi
 
 echo "Updating changelog for $version"
 # Update changelog
-cz ch --incremental --unreleased-version "ADBC Libraries ${version} RC ${rc_number}"
+cz ch --incremental --unreleased-version "ADBC Libraries ${version}"
 git add ${SOURCE_DIR}/../../CHANGELOG.md
 git commit -m "chore: update CHANGELOG.md for $version"
 
 echo "Prepare release ${version} on tag ${release_candidate_tag}"
 
 update_versions "${version}" "${next_version}" "release"
-git commit -m "chore: update versions for ${version}"
+# --allow-empty required for RCs after the first
+git commit -m "chore: update versions for ${version}" --allow-empty
 
 ######################### Tag the Release Candidate #########################
 
diff --git a/docs/source/development/releasing.rst b/docs/source/development/releasing.rst
index a484ed5..c6e1768 100644
--- a/docs/source/development/releasing.rst
+++ b/docs/source/development/releasing.rst
@@ -108,11 +108,14 @@ Create or update the corresponding maintenance branch
          # First cherry-pick any commits by hand.
          git switch maint-X.Y.Z
          git cherry-pick ...
+         # Revert the commit that created the changelog so we can
+         # regenerate it in 01-source.sh
+         git revert <CHANGELOG COMMIT>
          # Push the updated maintenance branch to the remote repository
          git push -u apache maint-X.Y.Z
 
-Create the Release Candidate branch from the updated maintenance branch
------------------------------------------------------------------------
+Create the Release Candidate tag from the updated maintenance branch
+--------------------------------------------------------------------
 
 .. code-block::