(arrow-adbc) branch main updated: chore(dev/release): include versions in changelog (#1945)

[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 b5943f35a chore(dev/release): include versions in changelog (#1945)
b5943f35a is described below

commit b5943f35aa426447a94cbb9a43f94f7e7f86aea4
Author: David Li <li...@gmail.com>
AuthorDate: Mon Jul 1 08:27:28 2024 +0900

    chore(dev/release): include versions in changelog (#1945)
    
    Fixes #1832.
---
 dev/release/01-prepare.sh   |  3 +--
 dev/release/02-sign.sh      |  4 +---
 dev/release/utils-common.sh | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/dev/release/01-prepare.sh b/dev/release/01-prepare.sh
index 279e764b6..8767e91d8 100755
--- a/dev/release/01-prepare.sh
+++ b/dev/release/01-prepare.sh
@@ -55,8 +55,7 @@ main() {
     # it by hand.
     (
         echo ;
-        # Strip trailing blank line
-        printf '%s\n' "$(cz ch --dry-run --unreleased-version "ADBC Libraries ${RELEASE}" --start-rev apache-arrow-adbc-${PREVIOUS_RELEASE})"
+        changelog
     ) >> ${SOURCE_DIR}/../../CHANGELOG.md
     git add ${SOURCE_DIR}/../../CHANGELOG.md
     git commit -m "chore: update CHANGELOG.md for ${RELEASE}"
diff --git a/dev/release/02-sign.sh b/dev/release/02-sign.sh
index 1bc067394..728407dfd 100755
--- a/dev/release/02-sign.sh
+++ b/dev/release/02-sign.sh
@@ -61,9 +61,7 @@ main() {
        --skip-existing
 
     header "Adding release notes"
-    # XXX: commitizen likes to include the entire history even if we
-    # give it a tag, so we have to give it both tags explicitly
-    local -r release_notes=$(cz ch --dry-run --unreleased-version "ADBC Libraries ${RELEASE}" --start-rev apache-arrow-adbc-${PREVIOUS_RELEASE})
+    local -r release_notes=$(changelog)
     echo "${release_notes}"
     gh release edit \
        "${tag}" \
diff --git a/dev/release/utils-common.sh b/dev/release/utils-common.sh
index 2cec70b66..99c9b6633 100644
--- a/dev/release/utils-common.sh
+++ b/dev/release/utils-common.sh
@@ -28,6 +28,7 @@ if [[ ! -f "${SOURCE_DIR}/.env" ]]; then
 fi
 
 source "${SOURCE_DIR}/.env"
+source "${SOURCE_DIR}/versions.env"
 
 header() {
     echo "============================================================"
@@ -35,6 +36,24 @@ header() {
     echo "============================================================"
 }
 
+changelog() {
+    # Strip trailing blank line
+    local -r changelog=$(printf '%s\n' "$(cz ch --dry-run --unreleased-version "ADBC Libraries ${RELEASE}" --start-rev apache-arrow-adbc-${PREVIOUS_RELEASE})")
+    # Split off header
+    local -r header=$(echo "${changelog}" | head -n 1)
+    local -r trailer=$(echo "${changelog}" | tail -n+2)
+    echo "${header}"
+    echo
+    echo "### Versions"
+    echo
+    echo "- C/C++/GLib/Go/Python/Ruby: ${VERSION_NATIVE}"
+    echo "- C#: ${VERSION_CSHARP}"
+    echo "- Java: ${VERSION_JAVA}"
+    echo "- R: ${VERSION_R}"
+    echo "- Rust: ${VERSION_RUST}"
+    echo "${trailer}"
+}
+
 header "Config"
 
 echo "Repository: ${REPOSITORY}"