Skip to content

Commit 1a4cbb7

Browse files
committed
Fixed brew link step for pkgconf
1 parent 1671e28 commit 1a4cbb7

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ jobs:
111111
- name: Install dependencies
112112
run: |
113113
brew install autoconf automake libtool libevent pkg-config openssl@${{ matrix.openssl }}
114+
# Handle OpenSSL 3.0 keg-only setup
114115
if [ "${{ matrix.openssl }}" == "3.0" ]; then
115116
echo 'export PATH="/opt/homebrew/opt/openssl@3.0/bin:$PATH"' >> $HOME/.bash_profile
116117
echo 'export LDFLAGS="-L/opt/homebrew/opt/openssl@3.0/lib"' >> $HOME/.bash_profile
@@ -119,7 +120,12 @@ jobs:
119120
source $HOME/.bash_profile
120121
/opt/homebrew/opt/openssl@3.0/bin/c_rehash
121122
fi
122-
brew unlink pkg-config@0.29.2 || true
123+
124+
# Handle missing pkg-config or pkgconf
125+
if ! brew list --versions pkgconf > /dev/null; then
126+
brew install pkgconf
127+
fi
128+
brew unlink pkg-config || true
123129
brew link --overwrite pkgconf
124130
- name: Build
125131
run: autoreconf -ivf && PKG_CONFIG_PATH=`brew --prefix openssl@${{ matrix.openssl }}`/lib/pkgconfig ./configure && make
@@ -134,7 +140,10 @@ jobs:
134140
- name: Install dependencies
135141
run: |
136142
brew install autoconf automake libtool libevent pkg-config
137-
brew unlink pkg-config@0.29.2 || true
143+
if ! brew list --versions pkgconf > /dev/null; then
144+
brew install pkgconf
145+
fi
146+
brew unlink pkg-config || true
138147
brew link --overwrite pkgconf
139148
- name: Install openssl v1.0.2
140149
run: brew install rbenv/tap/openssl@1.0

0 commit comments

Comments
 (0)