Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Nov 25, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d10e38e
[ci] Fix pkgconf package conflict
tobil4sk Nov 25, 2024
512b4e5
Link mariadb-connector-c in homebrew install
tobil4sk Nov 25, 2024
6d6a023
[ci] Remove verbose flag
tobil4sk Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion extra/Brewfile-STATIC_DEPS_ALL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
brew "cmake"
brew "ninja"
brew "pkg-config"
brew "pkgconf"
brew "automake"
brew "libtool"
2 changes: 1 addition & 1 deletion extra/Brewfile-STATIC_DEPS_NONE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Loading