[arrow-adbc] branch main updated: ci: re-enable Snowflake driver on aarch64 (#690)

[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 31e70de  ci: re-enable Snowflake driver on aarch64 (#690)
31e70de is described below

commit 31e70de62cbe56384f87af7b729285334804fd8c
Author: David Li <li.david...@gmail.com>
AuthorDate: Wed May 17 14:22:43 2023 -0400

    ci: re-enable Snowflake driver on aarch64 (#690)
    
    Fixes #675.
---
 ci/scripts/python_util.sh             | 15 +--------------
 ci/scripts/python_wheel_unix_build.sh | 11 +----------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/ci/scripts/python_util.sh b/ci/scripts/python_util.sh
index 56d1b8e..144c561 100644
--- a/ci/scripts/python_util.sh
+++ b/ci/scripts/python_util.sh
@@ -42,10 +42,6 @@ function build_drivers {
         export 
ADBC_SNOWFLAKE_LIBRARY=${build_dir}/lib/libadbc_driver_snowflake.so
         export VCPKG_DEFAULT_TRIPLET="${VCPKG_ARCH}-linux-static-release"
         export CMAKE_ARGUMENTS=""
-        if [[ "${VCPKG_ARCH}" = "arm64" ]]; then
-            # Can't build Arrow v11 on non-x64 platforms
-            ADBC_DRIVER_SNOWFLAKE=OFF
-        fi
     else # macOS
         export 
ADBC_FLIGHTSQL_LIBRARY=${build_dir}/lib/libadbc_driver_flightsql.dylib
         export 
ADBC_POSTGRESQL_LIBRARY=${build_dir}/lib/libadbc_driver_postgresql.dylib
@@ -55,9 +51,7 @@ function build_drivers {
         if [[ "${VCPKG_ARCH}" = "x64" ]]; then
             export CMAKE_ARGUMENTS="-DCMAKE_OSX_ARCHITECTURES=x86_64"
         elif [[ "${VCPKG_ARCH}" = "arm64" ]]; then
-            # Can't build Arrow v11 on non-x64 platforms
             export CMAKE_ARGUMENTS="-DCMAKE_OSX_ARCHITECTURES=arm64"
-            ADBC_DRIVER_SNOWFLAKE=OFF
         else
             echo "Unknown architecture: ${VCPKG_ARCH}"
             exit 1
@@ -100,7 +94,7 @@ function build_drivers {
         -DADBC_DRIVER_FLIGHTSQL=ON \
         -DADBC_DRIVER_POSTGRESQL=ON \
         -DADBC_DRIVER_SQLITE=ON \
-        -DADBC_DRIVER_SNOWFLAKE="${ADBC_DRIVER_SNOWFLAKE}" \
+        -DADBC_DRIVER_SNOWFLAKE=ON \
         ${source_dir}/c
     cmake --build . --target install --verbose -j
     popd
@@ -146,13 +140,6 @@ function test_packages {
     for component in ${COMPONENTS}; do
         echo "=== Testing $component ==="
 
-        if [[ "$component" = "adbc_driver_snowflake" ]] &&
-               ([[ "$(uname -m)" = "arm64" ]] ||
-                    [[ "$(uname -m)" = "aarch64" ]]); then
-            echo "=== Skipping $component on arm64 ==="
-            continue
-        fi
-
         python -c "
 import $component
 import $component.dbapi
diff --git a/ci/scripts/python_wheel_unix_build.sh 
b/ci/scripts/python_wheel_unix_build.sh
index ee1db53..3eea17f 100755
--- a/ci/scripts/python_wheel_unix_build.sh
+++ b/ci/scripts/python_wheel_unix_build.sh
@@ -82,22 +82,13 @@ build_drivers "${source_dir}" "${build_dir}"
 check_visibility $ADBC_FLIGHTSQL_LIBRARY
 check_visibility $ADBC_POSTGRESQL_LIBRARY
 check_visibility $ADBC_SQLITE_LIBRARY
-if [[ -f "$ADBC_SNOWFLAKE_LIBRARY" ]]; then
-    check_visibility $ADBC_SNOWFLAKE_LIBRARY
-else
-    echo "adbc_driver_snowflake not built"
-fi
+check_visibility $ADBC_SNOWFLAKE_LIBRARY
 
 # https://github.com/pypa/pip/issues/7555
 # Get the latest pip so we have in-tree-build by default
 python -m pip install --upgrade pip auditwheel cibuildwheel delocate 
setuptools wheel
 
 for component in $COMPONENTS; do
-    if [[ "$component" = "adbc_driver_snowflake" ]] && [[ "${VCPKG_ARCH}" = 
"arm64" ]]; then
-        echo "Skipping $component on arm64"
-        continue
-    fi
-
     pushd ${source_dir}/python/$component
 
     component_dashes=${component//_/-}