Skip to content

Commit b3f7e60

Browse files
authored
Merge pull request syslog-ng#5172 from HofiOne/fix-ci-macos
ci: fix macOS dep conflict
2 parents 7cfe487 + 338d68d commit b3f7e60

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Install dependencies
4444
run: |
4545
brew update --preinstall
46-
brew bundle --file=contrib/Brewfile
46+
brew bundle --force --file=contrib/Brewfile
4747
4848
OS_NAME=$([[ ${{ matrix.version }} -eq 13 ]] && echo "Ventura" || echo "Sonoma")
4949
MACPORTS_PKG_NAME=MacPorts-2.10.1-${{ matrix.version }}-${OS_NAME}.pkg

contrib/Brewfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ brew "json-c"
1212
brew "libtool"
1313
brew "openssl@3"
1414
brew "pcre2"
15-
brew "pkg-config"
15+
brew "pkgconf"
1616

1717
brew "curl"
1818
brew "gradle"

0 commit comments

Comments
 (0)