Fixed brew link step for pkgconf

RedisLabs · Nov 21, 2024 · 1a4cbb7 · 1a4cbb7
1 parent 1671e28
commit 1a4cbb7
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -111,6 +111,7 @@ jobs:
     - name: Install dependencies
       run:  |
         brew install autoconf automake libtool libevent pkg-config openssl@${{ matrix.openssl }}
+        # Handle OpenSSL 3.0 keg-only setup
         if [ "${{ matrix.openssl }}" == "3.0" ]; then
           echo 'export PATH="/opt/homebrew/opt/[email protected]/bin:$PATH"' >> $HOME/.bash_profile
           echo 'export LDFLAGS="-L/opt/homebrew/opt/[email protected]/lib"' >> $HOME/.bash_profile
@@ -119,7 +120,12 @@ jobs:
           source $HOME/.bash_profile
           /opt/homebrew/opt/[email protected]/bin/c_rehash
         fi
-        brew unlink [email protected] || true
+        
+        # Handle missing pkg-config or pkgconf
+        if ! brew list --versions pkgconf > /dev/null; then
+          brew install pkgconf
+        fi
+        brew unlink pkg-config || true
         brew link --overwrite pkgconf
     - name: Build
       run: autoreconf -ivf && PKG_CONFIG_PATH=`brew --prefix openssl@${{ matrix.openssl }}`/lib/pkgconfig ./configure && make
@@ -134,7 +140,10 @@ jobs:
     - name: Install dependencies
       run:  |
         brew install autoconf automake libtool libevent pkg-config
-        brew unlink [email protected] || true
+        if ! brew list --versions pkgconf > /dev/null; then
+          brew install pkgconf
+        fi
+        brew unlink pkg-config || true
         brew link --overwrite pkgconf
     - name: Install openssl v1.0.2
       run: brew install rbenv/tap/[email protected]