-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
GH-44844: [CI] Uninstall pkg-config entirely on verification and java…
…-jars macOS jobs (#44845) ### Rationale for this change Jobs are failing on nightlies. ### What changes are included in this PR? Remove pkg-config entirely as we've done on other CI jobs. ### Are these changes tested? Yes via archery ### Are there any user-facing changes? No * GitHub Issue: #44844 Lead-authored-by: Raúl Cumplido <[email protected]> Co-authored-by: Sutou Kouhei <[email protected]> Signed-off-by: Sutou Kouhei <[email protected]>
- Loading branch information
Showing
2 changed files
with
23 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -129,6 +129,14 @@ jobs: | |
done | ||
brew install --overwrite python | ||
if [ "$(uname -m)" = "arm64" ]; then | ||
# 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 uninstall [email protected] || : | ||
fi | ||
brew bundle --file=arrow/cpp/Brewfile | ||
# We want to link aws-sdk-cpp statically but Homebrew's | ||
# aws-sdk-cpp provides only shared library. If we have | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -42,8 +42,23 @@ jobs: | |
- name: Install System Dependencies | ||
shell: bash | ||
run: | | ||
{% if github_runner in ("macos-14", "macos-latest") %} | ||
# 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 uninstall [email protected] || : | ||
{% endif %} | ||
brew bundle --file=arrow/cpp/Brewfile | ||
brew bundle --file=arrow/c_glib/Brewfile | ||
# For Meson. | ||
# See also: https://github.com/mesonbuild/meson/issues/7701 | ||
pkgconf="$(brew --prefix pkgconf)/bin/pkgconf" | ||
if [ -x "${pkgconf}" ]; then | ||
echo "PKG_CONFIG=${pkgconf}" >> $GITHUB_ENV | ||
fi | ||
{% endif %} | ||
|
||
- uses: actions/setup-java@v2 | ||
|