From 33f9fb032c1b8b940a29c728bc871c44f03f0c27 Mon Sep 17 00:00:00 2001 From: Matt Harrison Date: Wed, 12 Jun 2024 17:13:07 -0400 Subject: [PATCH] put macos-13 back to old homebrew --- .github/workflows/binaries.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/binaries.yml b/.github/workflows/binaries.yml index 183e036..21aa525 100644 --- a/.github/workflows/binaries.yml +++ b/.github/workflows/binaries.yml @@ -85,7 +85,7 @@ jobs: - 1.26.x steps: - name: Install dependencies - run: brew install gsed jansson jq openssl@1.1 pcre zlib + run: brew install gsed jansson jq openssl@3 pcre zlib - name: Checkout master branch uses: actions/checkout@v4 @@ -99,15 +99,15 @@ jobs: # we have to remove them to give it no other option than using static. - name: Remove dylibs run: | - rm /opt/homebrew/opt/jansson/lib/*.dylib - rm /opt/homebrew/opt/openssl/lib/*.dylib - rm /opt/homebrew/opt/pcre/lib/*.dylib - rm /opt/homebrew/opt/zlib/lib/*.dylib + rm /usr/local/opt/jansson/lib/*.dylib + rm /usr/local/opt/openssl/lib/*.dylib + rm /usr/local/opt/pcre/lib/*.dylib + rm /usr/local/opt/zlib/lib/*.dylib - name: Build nginx env: - CFLAGS: ${{ env.CFLAGS }} -I/opt/homebrew/opt/jansson/include -I/opt/homebrew/opt/openssl/include -I/opt/homebrew/opt/pcre/include -I/opt/homebrew/opt/zlib/include - LDFLAGS: ${{ env.DARWIN_LDFLAGS }} -L/opt/homebrew/opt/jansson/lib -L/opt/homebrew/opt/openssl/lib -L/opt/homebrew/opt/pcre/lib -L/opt/homebrew/opt/zlib/lib + CFLAGS: ${{ env.CFLAGS }} -I/usr/local/opt/jansson/include -I/usr/local/opt/openssl/include -I/usr/local/opt/pcre/include -I/usr/local/opt/zlib/include + LDFLAGS: ${{ env.DARWIN_LDFLAGS }} -L/usr/local/opt/jansson/lib -L/usr/local/opt/openssl/lib -L/usr/local/opt/pcre/lib -L/usr/local/opt/zlib/lib run: ./master/scripts/build-nginx - name: Upload nginx binary to artifacts