(arrow-adbc) branch main updated: fix(dev/release): handle versioning scheme in binary verification (#1834)

[kou]

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

kou 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 2d842cbae fix(dev/release): handle versioning scheme in binary 
verification (#1834)
2d842cbae is described below

commit 2d842cbaeba513d6f70d794dd3279969e00190bc
Author: David Li <li.david...@gmail.com>
AuthorDate: Wed May 8 13:46:13 2024 +0900

    fix(dev/release): handle versioning scheme in binary verification (#1834)
    
    Fixes #1833.
---
 dev/release/verify-release-candidate.sh | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/dev/release/verify-release-candidate.sh 
b/dev/release/verify-release-candidate.sh
index ca81e78ba..825a450d4 100755
--- a/dev/release/verify-release-candidate.sh
+++ b/dev/release/verify-release-candidate.sh
@@ -614,6 +614,15 @@ ensure_source_directory() {
   if [ ! -d "${ARROW_SOURCE_DIR}" ]; then
     git clone --depth=1 https://github.com/$ARROW_REPOSITORY $ARROW_SOURCE_DIR
   fi
+
+  source "${ADBC_SOURCE_DIR}/dev/release/versions.env"
+  echo "Versions:"
+  echo "Release: ${RELEASE} (requested: ${VERSION})"
+  echo "C#: ${VERSION_CSHARP}"
+  echo "Java: ${VERSION_JAVA}"
+  echo "C/C++/GLib/Go/Python/Ruby: ${VERSION_NATIVE}"
+  echo "R: ${VERSION_R}"
+  echo "Rust: ${VERSION_RUST}"
 }
 
 test_source_distribution() {
@@ -701,14 +710,13 @@ test_linux_wheels() {
     CONDA_ENV=wheel-${pyver}-${arch} PYTHON_VERSION=${pyver} maybe_setup_conda 
|| exit 1
     VENV_ENV=wheel-${pyver}-${arch} PYTHON_VERSION=${pyver} 
maybe_setup_virtualenv || continue
     pip install --force-reinstall \
-        
adbc_*-${TEST_PYARROW_VERSION:-${VERSION}}-cp${pyver/.}-cp${python/.}-manylinux*${arch}*.whl
 \
-        
adbc_*-${TEST_PYARROW_VERSION:-${VERSION}}-py3-none-manylinux*${arch}*.whl
+        
adbc_*-${VERSION_NATIVE}-cp${pyver/.}-cp${python/.}-manylinux*${arch}*.whl \
+        adbc_*-${VERSION_NATIVE}-py3-none-manylinux*${arch}*.whl
     ${ADBC_DIR}/ci/scripts/python_wheel_unix_test.sh ${ADBC_SOURCE_DIR}
   done
 }
 
 test_macos_wheels() {
-  local python_versions="3.9 3.10 3.11"
   # apple silicon processor
   if [ "$(uname -m)" = "arm64" ]; then
     local platform_tags="arm64"
@@ -716,6 +724,8 @@ test_macos_wheels() {
     local platform_tags="x86_64"
   fi
 
+  local python_versions="${TEST_PYTHON_VERSIONS:-3.9 3.10 3.11}"
+
   # verify arch-native wheels inside an arch-native conda environment
   for python in ${python_versions}; do
     local pyver=${python/m}
@@ -726,8 +736,8 @@ test_macos_wheels() {
       VENV_ENV=wheel-${pyver}-${platform} PYTHON_VERSION=${pyver} 
maybe_setup_virtualenv || continue
 
       pip install --force-reinstall \
-          
adbc_*-${TEST_PYARROW_VERSION:-${VERSION}}-cp${pyver/.}-cp${python/.}-macosx_*_${platform}.whl
 \
-          
adbc_*-${TEST_PYARROW_VERSION:-${VERSION}}-py3-none-macosx_*_${platform}.whl
+          
adbc_*-${VERSION_NATIVE}-cp${pyver/.}-cp${python/.}-macosx_*_${platform}.whl \
+          adbc_*-${VERSION_NATIVE}-py3-none-macosx_*_${platform}.whl
       ${ADBC_DIR}/ci/scripts/python_wheel_unix_test.sh ${ADBC_SOURCE_DIR}
     done
   done
@@ -765,7 +775,7 @@ test_jars() {
   local -r components=(".jar" "-javadoc.jar" "-sources.jar")
   for package in "${packages[@]}"; do
       for component in "${components[@]}"; do
-          local filename="${BINARY_DIR}/${package}-${VERSION}${component}"
+          local filename="${BINARY_DIR}/${package}-${VERSION_JAVA}${component}"
           if [[ ! -f "${filename}" ]];  then
              echo "ERROR: missing artifact ${filename}"
              return 1