resolve merge issue

Author: David Coe

.github/workflows/native-unix.yml

@@ -250,13 +250,25 @@ jobs:
       - name: Build
         run: |
           meson setup \
-            -Db_sanitize=address,undefined \
             -Dauto_features=enabled \
             c c/build
           meson compile -C c/build
       - name: Test
         run: |
           meson test -C c/build --print-errorlogs
+      - name: Build with sanitizers
+        run: |
+          # skip bigquery and flightsql for now; see GH-2744
+          meson setup \
+            -Db_sanitize=address,undefined \
+            -Dauto_features=enabled \
+            -Dbigquery=disabled \
+            -Dflightsql=disabled \
+            c c/build
+          meson compile -C c/build
+      - name: Test with sanitizers
+        run: |
+          meson test -C c/build --print-errorlogs
       - name: Stop SQLite server, Dremio, and postgresql
         run: |
           docker compose down
@@ -387,7 +399,7 @@ jobs:
         with:
           fetch-depth: 0
           persist-credentials: false
-      - uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935  # v2.1.8
+      - uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193  # v2.1.10
         continue-on-error: true # if auth fails, bigquery driver tests should skip
         with:
           workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
@@ -449,7 +461,7 @@ jobs:
         with:
           fetch-depth: 0
           persist-credentials: false
-      - uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935  # v2.1.8
+      - uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193  # v2.1.10
         continue-on-error: true # if auth fails, bigquery driver tests should skip
         with:
           workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}

.github/workflows/nightly-verify.yml

@@ -39,6 +39,10 @@ defaults:
     # 'bash' will expand to -eo pipefail
     shell: bash
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   source:
     # For cron: only run on the main repo, not forks
@@ -201,3 +205,30 @@ jobs:
         run: |
           pushd arrow-adbc
           docker compose run -e PYTHON=3.12 --rm python-debug
+
+  source-verify-docker:
+    name: "Verify Source (OS)/${{ matrix.os }} ${{ matrix.version }}"
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 2
+      matrix:
+        include:
+          - os: ubuntu
+            version: "22.04"
+          - os: ubuntu
+            version: "24.04"
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          path: arrow-adbc
+          persist-credentials: false
+          submodules: recursive
+
+      - name: Verify
+        env:
+          OS: ${{ matrix.os }}
+          OS_VERSION: ${{ matrix.version }}
+        run: |
+          pushd arrow-adbc
+          env ${OS@U}=${OS_VERSION} docker compose run --rm verify-all-${OS}

.github/workflows/packaging.yml

@@ -25,6 +25,8 @@ on:
       - ".env"
       - "c/**"
       - "ci/**"
+      - "dev/release/verify-apt.sh"
+      - "dev/release/verify-yum.sh"
       - "glib/**"
       - "python/**"
       - "ruby/**"
@@ -344,7 +346,7 @@ jobs:
           mv apache-arrow-adbc-$VERSION.tar.gz adbc/ci/linux-packages/
 
       - name: Set up Ruby
-        uses: ruby/setup-ruby@ca041f971d66735f3e5ff1e21cc13e2d51e7e535  # v1.233.0
+        uses: ruby/setup-ruby@eaecf785f6a34567a6d97f686bbb7bccc1ac1e5c  # v1.237.0
         with:
           ruby-version: ruby
 

c/driver/bigquery/meson.build

@@ -55,6 +55,11 @@ pkg.generate(
     filebase: 'adbc-driver-bigquery',
 )
 
+adbc_driver_bigquery_dep = declare_dependency(
+    include_directories: include_dir,
+    link_with: adbc_driver_bigquery_lib,
+)
+
 exc = executable(
     'adbc-driver-bigquery-test',
     'bigquery_test.cc',

c/driver/flightsql/meson.build

@@ -55,6 +55,11 @@ pkg.generate(
     filebase: 'adbc-driver-flightsql',
 )
 
+adbc_driver_flightsql_dep = declare_dependency(
+    include_directories: include_dir,
+    link_with: adbc_driver_flightsql_lib,
+)
+
 exc = executable(
     'adbc-driver-flightsql-test',
     'dremio_flightsql_test.cc',

c/driver/postgresql/meson.build

@@ -41,6 +41,11 @@ pkg.generate(
     filebase: 'adbc-driver-postgresql',
 )
 
+adbc_driver_postgresql_dep = declare_dependency(
+    include_directories: include_dir,
+    link_with: adbc_postgres_driver_lib,
+)
+
 postgres_tests = {
     'driver-postgresql': {
         'src_name': 'driver_postgresql',

c/driver/snowflake/meson.build

@@ -55,6 +55,11 @@ pkg.generate(
     filebase: 'adbc-driver-snowflake',
 )
 
+adbc_driver_snowflake_dep = declare_dependency(
+    include_directories: include_dir,
+    link_with: adbc_driver_snowflake_lib,
+)
+
 exc = executable(
     'adbc-driver-snowflake-test',
     'snowflake_test.cc',

c/driver/sqlite/meson.build

@@ -39,6 +39,11 @@ pkg.generate(
     filebase: 'adbc-driver-sqlite',
 )
 
+adbc_driver_sqlite_dep = declare_dependency(
+    include_directories: include_dir,
+    link_with: adbc_sqlite3_driver_lib,
+)
+
 exc = executable(
     'adbc-driver-sqlite-test',
     sources: ['sqlite_test.cc'],

c/driver_manager/meson.build

@@ -32,3 +32,8 @@ pkg.generate(
     libraries: [adbc_driver_manager_lib],
     filebase: 'adbc-driver-manager',
 )
+
+adbc_driver_manager_dep = declare_dependency(
+    include_directories: include_dir,
+    link_with: adbc_driver_manager_lib,
+)

ci/scripts/verify_ubuntu.sh

@@ -0,0 +1,111 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# Test the validation script using system dependencies instead of Conda.  This
+# script is meant for automation (e.g. Docker), not a local/developer machine
+# (except via Docker).
+
+set -euo pipefail
+
+main() {
+    local -r source_dir="${1}"
+
+    # Install all the dependencies we need for all the subprojects
+
+    # When installing tzdata, don't block and wait for user input
+    export DEBIAN_FRONTEND=noninteractive
+    export TZ=Etc/UTC
+
+    apt update
+    apt install -y \
+        apt-transport-https \
+        build-essential \
+        ca-certificates \
+        cmake \
+        curl \
+        dirmngr \
+        git \
+        gobject-introspection \
+        gpg \
+        libgirepository1.0-dev \
+        libglib2.0-dev \
+        libgmock-dev \
+        libgtest-dev \
+        libpq-dev \
+        libsqlite3-dev \
+        lsb-release \
+        ninja-build \
+        pkg-config \
+        protobuf-compiler \
+        python3 \
+        python3-dev \
+        python3-pip \
+        python3-venv \
+        r-base \
+        ruby-full \
+        software-properties-common \
+        wget
+
+    # Install Java
+
+    wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | \
+        gpg --dearmor | \
+        tee /etc/apt/trusted.gpg.d/adoptium.gpg > /dev/null
+
+    echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | \
+        tee /etc/apt/sources.list.d/adoptium.list
+
+    # Install Arrow GLib
+    wget https://packages.apache.org/artifactory/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb
+    apt install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb
+
+    apt update
+    apt install -y \
+        libarrow-dev \
+        libarrow-glib-dev \
+        temurin-21-jdk
+
+    # Install Maven
+    wget https://dlcdn.apache.org/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.tar.gz
+    mkdir -p /opt/maven
+    tar -C /opt/maven -xzvf apache-maven-3.9.9-bin.tar.gz --strip-components=1
+    export PATH=/opt/maven/bin:$PATH
+
+    # Check if protoc is too old (Ubuntu 22.04).  If so, install it from
+    # upstream instead.
+    if ! protoc --version | \
+            awk '{print $2}{print "3.15"}' | \
+            sort --version-sort | \
+            head -n1 | \
+            grep -E '^3\.15.*$' >/dev/null ; then
+        echo "protoc is too old"
+
+        wget -O protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v30.2/protoc-30.2-linux-x86_64.zip
+        unzip -o protoc.zip -d /usr/local -x readme.txt
+    fi
+
+    # We run under Docker and this is necessary since the source dir is
+    # typically mounted as a volume
+    git config --global --add safe.directory "${source_dir}"
+
+    "${source_dir}/dev/release/verify-release-candidate.sh"
+}
+
+main "$@"