From a47725e2f0881d1c8e611a514cbfe9c3465f602f Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Fri, 26 Apr 2024 09:37:53 +0900 Subject: [PATCH] GH-41369: [CI][GLib] Don't use /usr/local on macOS (#41387) ### Rationale for this change We don't have write permission for `/usr/local` on macos-14. ### What changes are included in this PR? Use `/tmp/local` instead. ### Are these changes tested? Yes. ### Are there any user-facing changes? No. * GitHub Issue: #41369 Authored-by: Sutou Kouhei Signed-off-by: Sutou Kouhei --- .github/workflows/ruby.yml | 5 ++--- ci/scripts/c_glib_test.sh | 1 + ci/scripts/ruby_test.sh | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index ea3e61d55787d..11e3c93ed0806 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -117,7 +117,7 @@ jobs: run: archery docker push ubuntu-ruby macos: - name: AMD64 macOS 12 GLib & Ruby + name: AMD64 macOS 14 GLib & Ruby runs-on: macos-latest if: ${{ !contains(github.event.pull_request.title, 'WIP') }} timeout-minutes: 60 @@ -132,7 +132,7 @@ jobs: ARROW_GCS: ON ARROW_GLIB_GTK_DOC: true ARROW_GLIB_WERROR: true - ARROW_HOME: /usr/local + ARROW_HOME: /tmp/local ARROW_JEMALLOC: OFF ARROW_ORC: OFF ARROW_PARQUET: ON @@ -141,7 +141,6 @@ jobs: ARROW_WITH_SNAPPY: ON ARROW_WITH_ZLIB: ON ARROW_WITH_ZSTD: ON - XML_CATALOG_FILES: /usr/local/etc/xml/catalog steps: - name: Checkout Arrow uses: actions/checkout@v4 diff --git a/ci/scripts/c_glib_test.sh b/ci/scripts/c_glib_test.sh index f8083c7759d8a..02753872dcb2d 100755 --- a/ci/scripts/c_glib_test.sh +++ b/ci/scripts/c_glib_test.sh @@ -24,6 +24,7 @@ build_dir=${2}/c_glib : ${ARROW_GLIB_VAPI:=true} +export DYLD_LIBRARY_PATH=${ARROW_HOME}/lib:${DYLD_LIBRARY_PATH} export LD_LIBRARY_PATH=${ARROW_HOME}/lib:${LD_LIBRARY_PATH} export PKG_CONFIG_PATH=${ARROW_HOME}/lib/pkgconfig export GI_TYPELIB_PATH=${ARROW_HOME}/lib/girepository-1.0 diff --git a/ci/scripts/ruby_test.sh b/ci/scripts/ruby_test.sh index 56c33a4d6378a..507fa7858e870 100755 --- a/ci/scripts/ruby_test.sh +++ b/ci/scripts/ruby_test.sh @@ -22,6 +22,7 @@ set -ex source_dir=${1}/ruby build_dir=${2}/ruby +export DYLD_LIBRARY_PATH=${ARROW_HOME}/lib:${DYLD_LIBRARY_PATH} export LD_LIBRARY_PATH=${ARROW_HOME}/lib:${LD_LIBRARY_PATH} export PKG_CONFIG_PATH=${ARROW_HOME}/lib/pkgconfig export GI_TYPELIB_PATH=${ARROW_HOME}/lib/girepository-1.0