This is an automated email from the ASF dual-hosted git repository.

kou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/main by this push:
     new 27bbd59362 GH-44797: [CI] Update pkg-config to pkgconf on Homebrew 
(#44798)
27bbd59362 is described below

commit 27bbd593625122a4a25d9471c8aaf5df54a6dcf9
Author: Raúl Cumplido <[email protected]>
AuthorDate: Thu Nov 21 09:51:11 2024 +0100

    GH-44797: [CI] Update pkg-config to pkgconf on Homebrew (#44798)
    
    ### Rationale for this change
    
    Some CI jobs are currently failing on main:
    
    - [Python / ARM64 macOS 14 Python 
3](https://github.com/apache/arrow/actions/runs/11936033926/job/33268789966?pr=44796)
    - [C++ / ARM64 macOS 14 C++ 
](https://github.com/apache/arrow/actions/runs/11935481942/job/33268873278)
    
    ### What changes are included in this PR?
    
    Update from deprecated `pkg-config` to `pkgconf`
    
    ### Are these changes tested?
    
    Via CI
    
    ### Are there any user-facing changes?
    
    No
    * GitHub Issue: #44797
    
    Lead-authored-by: Raúl Cumplido <[email protected]>
    Co-authored-by: Sutou Kouhei <[email protected]>
    Co-authored-by: Sutou Kouhei <[email protected]>
    Signed-off-by: Sutou Kouhei <[email protected]>
---
 .github/workflows/cpp.yml    | 4 ++++
 .github/workflows/python.yml | 4 ++++
 .github/workflows/ruby.yml   | 3 +++
 cpp/Brewfile                 | 2 +-
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
index 996079e36a..afc09a53c9 100644
--- a/.github/workflows/cpp.yml
+++ b/.github/workflows/cpp.yml
@@ -251,6 +251,10 @@ jobs:
           submodules: recursive
       - name: Install Dependencies
         run: |
+          # pkg-config formula is deprecated but it's still installed
+          # in GitHub Actions runner now. We can remove this once
+          # pkg-config formula is removed from GitHub Actions runner.
+          brew uninstall pkg-config || :
           brew bundle --file=cpp/Brewfile
       - name: Install MinIO
         run: |
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index 72d6bfeab0..e092ed61eb 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -189,6 +189,10 @@ jobs:
       - name: Install Dependencies
         shell: bash
         run: |
+          # pkg-config formula is deprecated but it's still installed
+          # in GitHub Actions runner now. We can remove this once
+          # pkg-config formula is removed from GitHub Actions runner.
+          brew uninstall pkg-config || :
           brew bundle --file=cpp/Brewfile
           python -m pip install \
             -r python/requirements-build.txt \
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index 53c76404e2..bf59e62b12 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -157,6 +157,9 @@ jobs:
         run: |
           brew bundle --file=cpp/Brewfile
           brew bundle --file=c_glib/Brewfile
+          # For Meson.
+          # See also: https://github.com/mesonbuild/meson/issues/7701
+          echo "PKG_CONFIG=$(brew --prefix pkgconf)/bin/pkgconf" >> $GITHUB_ENV
       - name: Install Ruby Dependencies
         run: |
           export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"
diff --git a/cpp/Brewfile b/cpp/Brewfile
index 0f55279853..c6fd6d7992 100644
--- a/cpp/Brewfile
+++ b/cpp/Brewfile
@@ -35,7 +35,7 @@ brew "mimalloc"
 brew "ninja"
 brew "node"
 brew "openssl@3"
-brew "pkg-config"
+brew "pkgconf"
 brew "protobuf"
 brew "python"
 brew "rapidjson"

Reply via email to