[ci] Fix issues due to brew package changes (#294)

* [ci] Fix pkgconf package conflict * Link mariadb-connector-c in homebrew install This brew package is now keg-only so we need to link it explicitly for it to be symlinked into accessible paths. Homebrew/homebrew-core#196747 * [ci] Remove verbose flag
HaxeFoundation · Nov 25, 2024 · 6c09ca7 · 6c09ca7
1 parent d8a3b46
commit 6c09ca7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -67,6 +67,8 @@ jobs:
         run: |
           set -ex
           brew update
+          brew uninstall --force pkg-config
+          brew install pkgconf --overwrite
           brew bundle --file="${{ matrix.BREWFILE }}"
 
       - name: CMake

diff --git a/extra/Brewfile-STATIC_DEPS_ALL b/extra/Brewfile-STATIC_DEPS_ALL
@@ -1,5 +1,5 @@
 brew "cmake"
 brew "ninja"
-brew "pkg-config"
+brew "pkgconf"
 brew "automake"
 brew "libtool"
diff --git a/extra/Brewfile-STATIC_DEPS_NONE b/extra/Brewfile-STATIC_DEPS_NONE
@@ -2,6 +2,6 @@ brew "cmake"
 brew "ninja"
 brew "pkg-config"
 brew "bdw-gc"
-brew "mariadb-connector-c"
+brew "mariadb-connector-c", link: true
 brew "mbedtls"
 brew "pcre2"