@@ -30,13 +30,14 @@ permissions:
3030
3131jobs :
3232 build :
33+ timeout-minutes : 5
3334
3435 runs-on : ${{ matrix.os }}
3536 strategy :
36- max-parallel : 20
37+ max-parallel : 10
3738 matrix :
38- os : [macos-13, macos-14]
39- # os: [macos-11 , macos-12 , macos-13, ubuntu-20.04, ubuntu-22.04 ]
39+ # https://docs.github.com/en/actions/reference/runners/github-hosted-runners#supported-runners-and-hardware-resources
40+ os : [macos-15-intel , macos-26-intel , macos-14, macos-15, macos-26, ubuntu-latest, windows-latest ]
4041 fail-fast : false
4142
4243 steps :
@@ -47,16 +48,73 @@ jobs:
4748 run : |
4849 dir "C:\Program Files\OpenSSL*\*"
4950 dir "C:\Program Files\OpenSSL*\lib\*"
50- name : Find aes.h on !Windows
51+ name : Find OpenSSL on !Windows
5152 if : ${{ runner.os != 'Windows' }}
5253 run : |
53- set +e # want everything to run
54- find /usr -name aes.h -ls || true
55- find /usr -type d -name openssl -ls || true
56- find /opt -name aes.h -ls || true
57- find /opt -type d -name openssl -ls || true
58- ls -l /usr/local/include /usr/local/opt/openssl/include || true # is this where macos12-13 find aes.h?
59- ls -l /opt/local/include || true # Try this for macos-14
60- find /usr -type l -name openssl -ls 2>/dev/null
61- find /opt -type l -name openssl -ls 2>/dev/null
54+ set +e
55+ set -x
56+
57+ echo "=== OpenSSL Path Discovery ==="
58+
59+ if [[ "$OSTYPE" == "darwin"* ]]; then
60+ echo "--- macOS OpenSSL Detection ---"
61+
62+ MAC_OS_OPENSSL_DIRS=(
63+ "/opt/homebrew/opt/openssl@3"
64+ "/opt/homebrew/opt/openssl@1.1"
65+ "/usr/local/opt/openssl@3"
66+ "/usr/local/opt/openssl@1.1"
67+ "/opt/local"
68+ "/opt/homebrew"
69+ "/usr/local"
70+ )
71+
72+ MAC_LIB_OPENSSL=""
73+ MAC_INC_OPENSSL=""
74+
75+ echo "--- Checking directories ---"
76+ for dir in "${MAC_OS_OPENSSL_DIRS[@]}"; do
77+ lib_dir="$dir/lib"
78+ inc_dir="$dir/include"
79+
80+ echo " Checking: $dir"
81+
82+ if [[ -d "$lib_dir" ]] && [[ -z "$MAC_LIB_OPENSSL" ]]; then
83+ for lib in "libcrypto.dylib" "libcrypto.3.dylib" "libcrypto.1.1.dylib"; do
84+ if [[ -f "$lib_dir/$lib" ]]; then
85+ MAC_LIB_OPENSSL="$lib_dir"
86+ echo " Found lib: $lib_dir/$lib"
87+ break
88+ fi
89+ done
90+ fi
91+
92+ if [[ -d "$inc_dir" ]] && [[ -z "$MAC_INC_OPENSSL" ]] && [[ -f "$inc_dir/openssl/aes.h" ]]; then
93+ MAC_INC_OPENSSL="$inc_dir"
94+ echo " Found include: $inc_dir/openssl/aes.h"
95+ fi
96+ done
97+
98+ echo "--- Discovery Results ---"
99+ if [[ -n "$MAC_LIB_OPENSSL" ]]; then
100+ echo "MAC_LIB_OPENSSL=$MAC_LIB_OPENSSL"
101+ ls -la "$MAC_LIB_OPENSSL"/libcrypto*.dylib 2>/dev/null || true
102+ else
103+ echo "MAC_LIB_OPENSSL=NOT_FOUND"
104+ fi
105+
106+ if [[ -n "$MAC_INC_OPENSSL" ]]; then
107+ echo "MAC_INC_OPENSSL=$MAC_INC_OPENSSL"
108+ ls -la "$MAC_INC_OPENSSL"/openssl/aes.h 2>/dev/null || true
109+ else
110+ echo "MAC_INC_OPENSSL=NOT_FOUND"
111+ fi
112+ else
113+ echo "--- Linux OpenSSL Detection ---"
114+ find /usr -name aes.h -ls 2>/dev/null || true
115+ find /usr -type d -name openssl -ls 2>/dev/null || true
116+ find /usr/lib* -name libcrypto.so* -ls 2>/dev/null || true
117+ fi
118+
119+ echo "=== OpenSSL Binary Locations ==="
62120 which -a openssl | while read a ;do echo "$a" ; "$a" version -a; echo '======='; done
0 commit comments