[arrow-adbc] branch main updated: ci: make tests more robust to red-arrow/arrow-c-glib upgrades (#483)

[lidavidm]

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 fc01c31  ci: make tests more robust to red-arrow/arrow-c-glib upgrades 
 (#483)
fc01c31 is described below

commit fc01c31c95b48cdc22f0780d1498d89dd20563f9
Author: David Li <li.david...@gmail.com>
AuthorDate: Thu Mar 2 19:55:13 2023 -0500

    ci: make tests more robust to red-arrow/arrow-c-glib upgrades  (#483)
    
    Fixes #481.
---
 ci/linux-packages/apt/debian-bookworm/Dockerfile | 3 +--
 ci/scripts/glib_test.sh                          | 9 +++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ci/linux-packages/apt/debian-bookworm/Dockerfile 
b/ci/linux-packages/apt/debian-bookworm/Dockerfile
index aec76b7..378592e 100644
--- a/ci/linux-packages/apt/debian-bookworm/Dockerfile
+++ b/ci/linux-packages/apt/debian-bookworm/Dockerfile
@@ -52,12 +52,11 @@ RUN \
     libgirepository1.0-dev \
     libpq-dev \
     libsqlite3-dev \
+    meson \
     ninja-build \
     pkg-config \
     python3-dev \
     python3-pip \
     tzdata \
     valac && \
-  pip3 install --upgrade meson && \
-  ln -s /usr/local/bin/meson /usr/bin/ && \
   apt clean
diff --git a/ci/scripts/glib_test.sh b/ci/scripts/glib_test.sh
index 51d955b..b65c2de 100755
--- a/ci/scripts/glib_test.sh
+++ b/ci/scripts/glib_test.sh
@@ -74,6 +74,15 @@ test_subproject() {
         gem_flags='-- --with-cflags="-D_LIBCPP_DISABLE_AVAILABILITY" 
--with-cppflags="-D_LIBCPP_DISABLE_AVAILABILITY"'
     fi
 
+    # Install consistent version of red-arrow for given arrow-glib
+    local -r arrow_glib_version=$(pkg-config --modversion arrow-glib | sed -e 
's/-SNAPSHOT$//g' || :)
+    if [ -n "${arrow_glib_version}" ]; then
+        gem install \
+            --install-dir "${build_dir}/gems" \
+            --version ${arrow_glib_version} \
+            red-arrow \
+            -- ${gem_flags}
+    fi
     gem install --install-dir "${build_dir}/gems" pkg/*.gem -- ${gem_flags}
     popd
 }