From 5c07439ba3345cef3eb158a8b2b8064cc246199a Mon Sep 17 00:00:00 2001 From: Stefan Eissing Date: Thu, 13 Jul 2023 11:40:09 +0200 Subject: [PATCH] CI: brew fix for openssl in default path If brew install/update links openssl into /usr/local, it will be found before anything we add with `-isystem path` to CPP/LDLFAGS. Get rid of that by unlinking the keg. Fixes #11413 Closes #11436 --- .github/workflows/macos.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 088852ac26..2b382dd950 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -119,6 +119,17 @@ jobs: - run: "while [[ $? == 0 ]]; do for i in 1 2 3; do brew update && brew bundle install --no-lock --file /tmp/Brewfile && break 2 || { echo Error: wait to try again; sleep 10; } done; false Too many retries; done" name: 'brew install' + - run: | + case "${{ matrix.build.install }}" in + *openssl*) + ;; + *) + if test -d /usr/local/include/openssl; then + brew unlink openssl + fi;; + esac + name: 'brew unlink openssl' + - run: python3 -m pip install impacket name: 'pip3 install' @@ -177,6 +188,17 @@ jobs: - run: "while [[ $? == 0 ]]; do for i in 1 2 3; do brew update && brew bundle install --no-lock --file /tmp/Brewfile && break 2 || { echo Error: wait to try again; sleep 10; } done; false Too many retries; done" name: 'brew install' + - run: | + case "${{ matrix.build.install }}" in + *openssl*) + ;; + *) + if test -d /usr/local/include/openssl; then + brew unlink openssl + fi;; + esac + name: 'brew unlink openssl' + - uses: actions/checkout@v3 - run: cmake -S. -Bbuild -DCURL_WERROR=ON -DPICKY_COMPILER=ON ${{ matrix.build.generate }}