From 4caed2bea31ad7ce743e1f5464be3f6d3d6c621a Mon Sep 17 00:00:00 2001 From: filipecosta90 Date: Thu, 21 Nov 2024 23:14:49 +0000 Subject: [PATCH] Fixing pkgconfig link and unlink --- .github/workflows/ci.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 06cb269..8111ec4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -111,15 +111,12 @@ 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/openssl@3.0/bin:$PATH"' >> $HOME/.bash_profile - echo 'export LDFLAGS="-L/opt/homebrew/opt/openssl@3.0/lib"' >> $HOME/.bash_profile - echo 'export CPPFLAGS="-I/opt/homebrew/opt/openssl@3.0/include"' >> $HOME/.bash_profile - echo 'export PKG_CONFIG_PATH="/opt/homebrew/opt/openssl@3.0/lib/pkgconfig"' >> $HOME/.bash_profile - source $HOME/.bash_profile - /opt/homebrew/opt/openssl@3.0/bin/c_rehash - fi + echo 'export PATH="/opt/homebrew/opt/openssl@${{ matrix.openssl }}/bin:$PATH"' >> $HOME/.bash_profile + echo 'export LDFLAGS="-L/opt/homebrew/opt/openssl@${{ matrix.openssl }}/lib"' >> $HOME/.bash_profile + echo 'export CPPFLAGS="-I/opt/homebrew/opt/openssl@@${{ matrix.openssl }}/include"' >> $HOME/.bash_profile + echo 'export PKG_CONFIG_PATH="/opt/homebrew/opt/openssl@@${{ matrix.openssl }}/lib/pkgconfig"' >> $HOME/.bash_profile + source $HOME/.bash_profile + /opt/homebrew/opt/openssl@@${{ matrix.openssl }}/bin/c_rehash - name: Build run: autoreconf -ivf && PKG_CONFIG_PATH=`brew --prefix openssl@${{ matrix.openssl }}`/lib/pkgconfig ./configure && make @@ -132,8 +129,6 @@ jobs: - uses: actions/checkout@v1 - name: Install dependencies run: | - brew unlink pkg-config@0.29.2 || true - brew unlink pkg-config || true brew install autoconf automake libtool libevent pkg-config if ! brew list --versions pkgconf > /dev/null; then brew install pkgconf