You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by li...@apache.org on 2022/12/12 16:14:22 UTC
[arrow-adbc] branch main updated: chore(glib,ruby): unpin red-arrow (#219)
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 04df6ee chore(glib,ruby): unpin red-arrow (#219)
04df6ee is described below
commit 04df6eec1ffacb336daee9a77cdfb39becd46ee9
Author: David Li <li...@gmail.com>
AuthorDate: Mon Dec 12 11:14:14 2022 -0500
chore(glib,ruby): unpin red-arrow (#219)
Closes #162.
---
.github/workflows/cpp.yml | 9 ++++++---
ci/scripts/glib_test.sh | 14 ++++++++++++++
glib/Gemfile | 2 +-
ruby/Gemfile | 2 +-
4 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
index 05366ee..83c2f0f 100644
--- a/.github/workflows/cpp.yml
+++ b/.github/workflows/cpp.yml
@@ -49,6 +49,10 @@ jobs:
strategy:
matrix:
os: ["macos-latest", "ubuntu-latest"]
+ env:
+ # Required for macOS
+ # https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk
+ CXXFLAGS: "-D_LIBCPP_DISABLE_AVAILABILITY"
steps:
- uses: actions/checkout@v3
with:
@@ -72,12 +76,11 @@ jobs:
miniforge-variant: Mambaforge
miniforge-version: latest
use-mamba: true
- # Required for caching
- use-only-tar-bz2: true
- name: Install Dependencies
shell: bash -l {0}
run: |
- mamba install \
+ mamba install -c conda-forge \
+ 'arrow-c-glib>=10.0.0' \
--file ci/conda_env_cpp.txt \
--file ci/conda_env_docs.txt \
--file ci/conda_env_glib.txt \
diff --git a/ci/scripts/glib_test.sh b/ci/scripts/glib_test.sh
index 388ab44..e14f616 100755
--- a/ci/scripts/glib_test.sh
+++ b/ci/scripts/glib_test.sh
@@ -36,6 +36,13 @@ test_subproject() {
fi
pushd "${source_dir}/glib"
+
+ if [[ "$(uname)" = "Darwin" ]]; then
+ bundle config build.red-arrow -- \
+ --with-cflags=\"-D_LIBCPP_DISABLE_AVAILABILITY\" \
+ --with-cppflags=\"-D_LIBCPP_DISABLE_AVAILABILITY\"
+ fi
+
bundle install
bundle exec \
env DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}" \
@@ -44,6 +51,13 @@ test_subproject() {
export GI_TYPELIB_PATH="${install_dir}/lib/girepository-1.0:${GI_TYPELIB_PATH}"
pushd "${source_dir}/ruby"
+
+ if [[ "$(uname)" = "Darwin" ]]; then
+ bundle config build.red-arrow -- \
+ --with-cflags=\"-D_LIBCPP_DISABLE_AVAILABILITY\" \
+ --with-cppflags=\"-D_LIBCPP_DISABLE_AVAILABILITY\"
+ fi
+
bundle install
bundle exec \
env DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}" \
diff --git a/glib/Gemfile b/glib/Gemfile
index 4e2fee2..4af8f0a 100644
--- a/glib/Gemfile
+++ b/glib/Gemfile
@@ -20,5 +20,5 @@
source "https://rubygems.org/"
gem "gobject-introspection", ">= 4.0.1"
-gem "red-arrow", "< 10.0.0"
+gem "red-arrow"
gem "test-unit"
diff --git a/ruby/Gemfile b/ruby/Gemfile
index ae941e9..c38075c 100644
--- a/ruby/Gemfile
+++ b/ruby/Gemfile
@@ -23,5 +23,5 @@ gemspec
gem "bundler"
gem "rake"
-gem "red-arrow", "< 10.0.0"
+gem "red-arrow"
gem "test-unit"