File tree 1 file changed +9
-5
lines changed
1 file changed +9
-5
lines changed Original file line number Diff line number Diff line change @@ -176,7 +176,7 @@ jobs:
176
176
177
177
- id : macos-arm64
178
178
target : aarch64-apple-darwin
179
- os : macos-14
179
+ os : macos-15
180
180
architecture : " arm64"
181
181
182
182
- id : macos-x64
@@ -271,19 +271,22 @@ jobs:
271
271
icu4c \
272
272
llvm \
273
273
lz4 \
274
+ openssl \
274
275
pkg-config \
275
276
readline \
276
277
xz \
277
278
zstd
278
279
279
280
brew_dir="/usr/local"
280
281
if [ "${{ matrix.id }}" == "macos-arm64" ]; then
281
- brew_dir="$HOME/brew "
282
+ brew_dir="/opt/homebrew "
282
283
fi
284
+ brew_opt_dir="$brew_dir/opt"
285
+ ls -l "$brew_opt_dir"
283
286
284
- echo "CPPFLAGS=-I${brew_dir}/opt/ icu4c/include" | tee -a $GITHUB_ENV
285
- echo "LDFLAGS=-L${brew_dir}/opt/ icu4c/lib" | tee -a $GITHUB_ENV
286
- echo "LLVM_CONFIG=${brew_dir}/opt /llvm/bin/llvm-config" | tee -a $GITHUB_ENV
287
+ echo "CPPFLAGS=-I${brew_opt_dir}/ icu4c/include -I${brew_opt_dir}/openssl /include" | tee -a $GITHUB_ENV
288
+ echo "LDFLAGS=-L${brew_opt_dir}/ icu4c/lib -L${brew_opt_dir}/openssl /lib" | tee -a $GITHUB_ENV
289
+ echo "LLVM_CONFIG=${brew_opt_dir} /llvm/bin/llvm-config" | tee -a $GITHUB_ENV
287
290
288
291
- name : Build (MacOS)
289
292
if : ${{ startsWith(matrix.id, 'macos-') }}
@@ -302,6 +305,7 @@ jobs:
302
305
--with-libxslt \
303
306
$([ $major_version -ge 16 ] && echo "--with-llvm") \
304
307
$([ $major_version -ge 14 ] && echo "--with-lz4") \
308
+ --with-openssl \
305
309
--with-pgport=5432 \
306
310
$([ $major_version -ge 15 ] && echo "--with-python") \
307
311
--with-readline \
You can’t perform that action at this time.
0 commit comments