[arrow-adbc] branch main updated: chore(dev/release): work around commitizen changelog issue (#426)

[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 47d6d19  chore(dev/release): work around commitizen changelog issue (#426)
47d6d19 is described below

commit 47d6d19e4c2ab01ad11c561d5367e33ab0fbad4b
Author: David Li <li...@gmail.com>
AuthorDate: Tue Feb 7 10:54:33 2023 -0500

    chore(dev/release): work around commitizen changelog issue (#426)
---
 dev/release/01-prepare.sh             | 21 ++++++++++++++-------
 docs/source/development/releasing.rst |  4 ++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/dev/release/01-prepare.sh b/dev/release/01-prepare.sh
index eed7afc..7dab796 100755
--- a/dev/release/01-prepare.sh
+++ b/dev/release/01-prepare.sh
@@ -21,19 +21,20 @@ set -ue
 
 SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-if [ "$#" -ne 4 ]; then
-  echo "Usage: $0 <arrow-dir> <version> <next_version> <rc-num>"
-  echo "Usage: $0 ../arrow 0.1.0 1.0.0 0"
+if [ "$#" -ne 5 ]; then
+  echo "Usage: $0 <arrow-dir> <prev_veresion> <version> <next_version> <rc-num>"
+  echo "Usage: $0 ../arrow 0.1.0 0.2.0 0.3.0 0"
   exit 1
 fi
 
 . $SOURCE_DIR/utils-prepare.sh
 
 arrow_dir=$1
-version=$2
-next_version=$3
+prev_version=$2
+version=$3
+next_version=$4
 next_version_snapshot="${next_version}-SNAPSHOT"
-rc_number=$4
+rc_number=$5
 
 export ARROW_SOURCE="$(cd "${arrow_dir}" && pwd)"
 
@@ -54,7 +55,13 @@ fi
 
 echo "Updating changelog for $version"
 # Update changelog
-cz ch --incremental --unreleased-version "ADBC Libraries ${version}"
+# XXX: commitizen doesn't respect --tag-format with --incremental, so mimic
+# it by hand.
+(
+    echo ;
+    # Strip trailing blank line
+    printf '%s\n' "$(cz ch --dry-run --unreleased-version "ADBC Libraries ${version}" --start-rev apache-arrow-adbc-${prev_version})"
+) >> ${SOURCE_DIR}/../../CHANGELOG.md
 git add ${SOURCE_DIR}/../../CHANGELOG.md
 git commit -m "chore: update CHANGELOG.md for $version"
 
diff --git a/docs/source/development/releasing.rst b/docs/source/development/releasing.rst
index bc7422f..824daa8 100644
--- a/docs/source/development/releasing.rst
+++ b/docs/source/development/releasing.rst
@@ -135,9 +135,9 @@ Create the Release Candidate tag from the updated maintenance branch
    # on OSX use gnu-sed with homebrew: brew install gnu-sed (and export to $PATH)
    #
    # <rc-number> starts at 0 and increments every time the Release Candidate is burned
-   # so for the first RC this would be: dev/release/01-prepare.sh 4.0.0 5.0.0 0
+   # so for the first RC this would be: dev/release/01-prepare.sh 3.0.0 4.0.0 5.0.0 0
 
-   dev/release/01-prepare.sh <arrow-dir> <version> <next-version> <rc-number>
+   dev/release/01-prepare.sh <arrow-dir> <prev-version> <version> <next-version> <rc-number>
 
    git push -u apache apache-arrow-adbc-<version>-rc<rc-number> maint-<version>