chore(dev/release): update bump-versions

lidavidm · May 21, 2024 · db91b8c · db91b8c
1 parent 75ed095
commit db91b8c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 19 deletions.
diff --git a/dev/release/post-09-bump-versions.sh b/dev/release/post-09-bump-versions.sh
@@ -48,10 +48,6 @@ main() {
 
     ########################## Update Snapshot Version ##########################
 
-    git fetch --all --prune --tags --force -j$(nproc)
-    git switch main
-    git rebase apache/main
-
     echo "Updating versions for ${RELEASE}-SNAPSHOT"
     update_versions "snapshot"
     git commit -m "chore: update versions for ${RELEASE}-SNAPSHOT"
@@ -64,8 +60,7 @@ main() {
     echo "Updated changelog on branch."
 
     echo "Review the commits just made."
-    echo "Then, push changes to apache/arrow-adbc:main with:"
-    echo git push apache main
+    echo "Then, create a new pull request."
 }
 
 main "$@"
diff --git a/dev/release/utils-prepare.sh b/dev/release/utils-prepare.sh
@@ -118,12 +118,12 @@ update_versions() {
   else
     so_version() {
       local -r version=$1
-      local -r major_version=$(echo $c_version | sed -E -e 's/^([0-9]+)\.[0-9]+\.[0-9]+$/\1/')
-      local -r minor_version=$(echo $c_version | sed -E -e 's/^[0-9]+\.([0-9]+)\.[0-9]+$/\1/')
+      local -r major_version=$(echo $version | sed -E -e 's/^([0-9]+)\.[0-9]+\.[0-9]+$/\1/')
+      local -r minor_version=$(echo $version | sed -E -e 's/^[0-9]+\.([0-9]+)\.[0-9]+$/\1/')
       printf "%0d%02d" ${major_version} ${minor_version}
     }
-    local -r deb_lib_suffix=$(so_version ${base_version})
-    local -r next_deb_lib_suffix=$(so_version ${next_version})
+    local -r deb_lib_suffix=$(so_version ${PREVIOUS_VERSION_NATIVE})
+    local -r next_deb_lib_suffix=$(so_version ${VERSION_NATIVE})
     pushd "${ADBC_DIR}/ci/linux-packages"
     if [ "${deb_lib_suffix}" != "${next_deb_lib_suffix}" ]; then
       for target in debian*/lib*${deb_lib_suffix}.install; do
@@ -137,8 +137,8 @@ update_versions() {
       rm -f debian*/control*.bak
       git add debian*/control*
     fi
-    local -r base_major_version=$(echo ${base_version} | sed -E -e 's/^([0-9]+)\.[0-9]+\.[0-9]+$/\1/')
-    local -r next_major_version=$(echo ${next_version} | sed -E -e 's/^([0-9]+)\.[0-9]+\.[0-9]+$/\1/')
+    local -r base_major_version=$(echo ${PREVIOUS_VERSION_NATIVE} | sed -E -e 's/^([0-9]+)\.[0-9]+\.[0-9]+$/\1/')
+    local -r next_major_version=$(echo ${VERSION_NATIVE} | sed -E -e 's/^([0-9]+)\.[0-9]+\.[0-9]+$/\1/')
     if [ "${base_major_version}" != "${next_major_version}" ]; then
       for target in debian*/libadbc-*glib${base_major_version}.install; do
         git mv \

diff --git a/dev/release/versions.env b/dev/release/versions.env
@@ -17,14 +17,17 @@
 
 # The release as a whole has a counter-based identifier (as in, 12 is the
 # 12th release of ADBC).  This is used to identify tags, branches, and so on.
-RELEASE="12"
-PREVIOUS_RELEASE="0.11.0"
+RELEASE="13"
+PREVIOUS_RELEASE="12"
 
 # Individual components will have a SemVer.
-VERSION_CSHARP="0.12.0"
-VERSION_JAVA="0.12.0"
+VERSION_CSHARP="0.13.0"
+VERSION_JAVA="0.13.0"
 # Because C++/GLib/Go/Python/Ruby are effectively tied at the hip, they share
 # a single version number. Also covers Conda/Linux packages.
-VERSION_NATIVE="1.0.0"
-VERSION_R="0.12.0"
-VERSION_RUST="0.12.0"
+VERSION_NATIVE="1.1.0"
+VERSION_R="0.13.0"
+VERSION_RUST="0.13.0"
+
+# Required by the version bump script
+PREVIOUS_VERSION_NATIVE="1.0.0"