From 7126c44e802d5f6ad3ad793ed944aabe708bb73f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Wed, 20 Nov 2024 16:21:25 +0100 Subject: [PATCH 1/9] GH-44797: [CI] Update pkg-config to pkgconf on Homebrew --- cpp/Brewfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/Brewfile b/cpp/Brewfile index 0f5527985364c..c6fd6d7992da0 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" From e8752998899311b5aad260fb1edb932ca9a19fbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Wed, 20 Nov 2024 16:58:40 +0100 Subject: [PATCH 2/9] Unlink pkg-config for Python build and add pkg-config environment variable for Ruby --- .github/workflows/python.yml | 1 + .github/workflows/ruby.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 72d6bfeab0404..9dc643eb152c9 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -189,6 +189,7 @@ jobs: - name: Install Dependencies shell: bash run: | + brew unlink pkg-config@0.29.2 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 53c76404e2ce4..4ab6f01081297 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -159,6 +159,7 @@ jobs: brew bundle --file=c_glib/Brewfile - name: Install Ruby Dependencies run: | + export PKG_CONFIG=/opt/homebrew/bin/pkg-config export MAKEFLAGS="-j$(sysctl -n hw.ncpu)" bundle install --gemfile c_glib/Gemfile bundle install --gemfile ruby/Gemfile From 456cc68536f855b36965b9ee77457fedd4a9acb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Wed, 20 Nov 2024 17:08:29 +0100 Subject: [PATCH 3/9] Remove unlinking as it is not working --- .github/workflows/python.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 9dc643eb152c9..72d6bfeab0404 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -189,7 +189,6 @@ jobs: - name: Install Dependencies shell: bash run: | - brew unlink pkg-config@0.29.2 brew bundle --file=cpp/Brewfile python -m pip install \ -r python/requirements-build.txt \ From d1a6e2f8f514c5c433cdb4c8c24a096c54a4eec1 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Thu, 21 Nov 2024 11:24:57 +0900 Subject: [PATCH 4/9] Remove a needless configuration --- .github/workflows/ruby.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 4ab6f01081297..53c76404e2ce4 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -159,7 +159,6 @@ jobs: brew bundle --file=c_glib/Brewfile - name: Install Ruby Dependencies run: | - export PKG_CONFIG=/opt/homebrew/bin/pkg-config export MAKEFLAGS="-j$(sysctl -n hw.ncpu)" bundle install --gemfile c_glib/Gemfile bundle install --gemfile ruby/Gemfile From afeb15e27b670f352ced1db11a3df62568f83d77 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Thu, 21 Nov 2024 12:05:00 +0900 Subject: [PATCH 5/9] Set PKG_CONFIG for Meson --- .github/workflows/ruby.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 53c76404e2ce4..bf59e62b12fa6 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)" From 97b7a1556d2deb1389391c2bfe4be6c233a40c48 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Thu, 21 Nov 2024 12:31:44 +0900 Subject: [PATCH 6/9] Uninstall pkg-config --- .github/workflows/python.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 72d6bfeab0404..e092ed61eb6d9 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 \ From e348cc72d65bfcb63ce511f0218c453c656c3b6d Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Thu, 21 Nov 2024 14:37:31 +0900 Subject: [PATCH 7/9] Uninstall pkg-config --- .github/workflows/ruby.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index bf59e62b12fa6..0c891f1daecb6 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -155,6 +155,10 @@ jobs: - name: Install Homebrew 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 brew bundle --file=c_glib/Brewfile # For Meson. From 51b5f41b5740655b1cf2fc5b2c937693afab47b7 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Thu, 21 Nov 2024 14:38:23 +0900 Subject: [PATCH 8/9] Uninstall pkg-config --- .github/workflows/cpp.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml index 996079e36a314..afc09a53c9cbc 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: | From e45627d759bb499ee58e72de42a7ea7319cc2204 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Thu, 21 Nov 2024 14:47:42 +0900 Subject: [PATCH 9/9] Revert uninstall pkg-config --- .github/workflows/ruby.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 0c891f1daecb6..bf59e62b12fa6 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -155,10 +155,6 @@ jobs: - name: Install Homebrew 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 brew bundle --file=c_glib/Brewfile # For Meson.