Merge pull request #8 from theseus-rs/add-openssl-to-mac-build

build: add openssl configuration to mac build
theseus-rs · Oct 28, 2024 · d4c483a · d4c483a
2 parents 93eb7cf + 940a73a
commit d4c483a
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -176,7 +176,7 @@ jobs:
 
           - id: macos-arm64
             target: aarch64-apple-darwin
-            os: macos-14
+            os: macos-15
             architecture: "arm64"
 
           - id: macos-x64
@@ -271,19 +271,22 @@ jobs:
             icu4c \
             llvm \
             lz4 \
+            openssl \
             pkg-config \
             readline \
             xz \
             zstd
           
           brew_dir="/usr/local"
           if [ "${{ matrix.id }}" == "macos-arm64" ]; then
-            brew_dir="$HOME/brew"
+            brew_dir="/opt/homebrew"
           fi
+          brew_opt_dir="$brew_dir/opt"          
+          ls -l "$brew_opt_dir"
 
-          echo "CPPFLAGS=-I${brew_dir}/opt/icu4c/include" | tee -a $GITHUB_ENV
-          echo "LDFLAGS=-L${brew_dir}/opt/icu4c/lib" | tee -a $GITHUB_ENV
-          echo "LLVM_CONFIG=${brew_dir}/opt/llvm/bin/llvm-config" | tee -a $GITHUB_ENV
+          echo "CPPFLAGS=-I${brew_opt_dir}/icu4c/include -I${brew_opt_dir}/openssl/include" | tee -a $GITHUB_ENV
+          echo "LDFLAGS=-L${brew_opt_dir}/icu4c/lib -L${brew_opt_dir}/openssl/lib" | tee -a $GITHUB_ENV
+          echo "LLVM_CONFIG=${brew_opt_dir}/llvm/bin/llvm-config" | tee -a $GITHUB_ENV
 
       - name: Build (MacOS)
         if: ${{ startsWith(matrix.id, 'macos-') }}
@@ -302,6 +305,7 @@ jobs:
             --with-libxslt \
             $([ $major_version -ge 16 ] && echo "--with-llvm") \
             $([ $major_version -ge 14 ] && echo "--with-lz4") \
+            --with-openssl \
             --with-pgport=5432 \
             $([ $major_version -ge 15 ] && echo "--with-python") \
             --with-readline \