Skip to content

Commit 6c09ca7

Browse files
authored
[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
1 parent d8a3b46 commit 6c09ca7

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

.github/workflows/main.yml

+2
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ jobs:
6767
run: |
6868
set -ex
6969
brew update
70+
brew uninstall --force pkg-config
71+
brew install pkgconf --overwrite
7072
brew bundle --file="${{ matrix.BREWFILE }}"
7173
7274
- name: CMake

extra/Brewfile-STATIC_DEPS_ALL

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
brew "cmake"
22
brew "ninja"
3-
brew "pkg-config"
3+
brew "pkgconf"
44
brew "automake"
55
brew "libtool"

extra/Brewfile-STATIC_DEPS_NONE

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ brew "cmake"
22
brew "ninja"
33
brew "pkg-config"
44
brew "bdw-gc"
5-
brew "mariadb-connector-c"
5+
brew "mariadb-connector-c", link: true
66
brew "mbedtls"
77
brew "pcre2"

0 commit comments

Comments
 (0)