Skip to content

Commit c42c5d9

Browse files
author
David Coe
committed
Merge https://github.com/davidhcoe/arrow-adbc into dev/bigquery-fixes
2 parents b52cf43 + 94143dd commit c42c5d9

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

ci/conda_env_glib.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,5 @@ glib
2020
gobject-introspection
2121
meson
2222
postgresql
23-
# It appears 3.4.0 adds a dependency on stdckdint.h which isn't actually usable
24-
ruby <3.4.0
25-
# TODO(https://github.com/apache/arrow-adbc/issues/2176): pin for now because
26-
# gobject-introspection uses a deprecated/removed API
27-
setuptools <74
23+
ruby
24+
setuptools

ci/scripts/r_build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
set -e
2020

2121
: ${BUILD_ALL:=1}
22+
: ${BUILD_DRIVER_BIGQUERY:=${BUILD_ALL}}
2223
: ${BUILD_DRIVER_FLIGHTSQL:=${BUILD_ALL}}
2324
: ${BUILD_DRIVER_MANAGER:=${BUILD_ALL}}
2425
: ${BUILD_DRIVER_POSTGRESQL:=${BUILD_ALL}}

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ services:
210210
args:
211211
GO: ${GO}
212212
healthcheck:
213-
test: ["CMD", "curl", "--http2-prior-knowledge", "-XPOST", "-H", "content-type: application/grpc"]
213+
test: ["CMD", "curl", "--http2-prior-knowledge", "-XPOST", "-H", "content-type: application/grpc", "localhost:41414"]
214214
interval: 5s
215215
timeout: 30s
216216
retries: 3

0 commit comments

Comments
 (0)