Github's documentation states: macos-11 label has been deprecated and
will no longer be available after 6/28/2024. Add macos14 which is nowadays
supported instead.
The github macos-14 runner is using the M1 platform with ARM, so this
requires a bit more adjustment of paths.
Change-Id: Ia70f230b2e9a78939d1875395205c8f48c4944b7
Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: Frank Lichtenheld <frank@lichtenheld.com>
Message-Id: <20240502122231.672-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/search?l=mid&q=20240502122231.672-1-gert@greenie.muc.de
Signed-off-by: Gert Doering <gert@greenie.muc.de>
| ... | ... |
@@ -202,8 +202,16 @@ jobs: |
| 202 | 202 |
matrix: |
| 203 | 203 |
ssllib: [ openssl11, openssl3, libressl] |
| 204 | 204 |
build: [ normal, asan ] |
| 205 |
- os: [macos-11, macos-12, macos-13] |
|
| 205 |
+ os: [macos-12, macos-13, macos-14] |
|
| 206 | 206 |
include: |
| 207 |
+ # macos14 and newer runners use ARM CPUs and homebrew uses /opt/homebrew/ |
|
| 208 |
+ # on ARM instead of /usr/local/ |
|
| 209 |
+ - os: macos-12 |
|
| 210 |
+ homebrew: /usr/local/opt |
|
| 211 |
+ - os: macos-13 |
|
| 212 |
+ homebrew: /usr/local/opt |
|
| 213 |
+ - os: macos-14 |
|
| 214 |
+ homebrew: /opt/homebrew/opt |
|
| 207 | 215 |
- build: asan |
| 208 | 216 |
cflags: "-fsanitize=address,undefined -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" |
| 209 | 217 |
ldflags: -fsanitize=address,undefined -fno-sanitize-recover=all |
| ... | ... |
@@ -228,8 +236,10 @@ jobs: |
| 228 | 228 |
env: |
| 229 | 229 |
CFLAGS: ${{ matrix.cflags }}
|
| 230 | 230 |
LDFLAGS: ${{ matrix.ldflags }}
|
| 231 |
- OPENSSL_CFLAGS: "-I/usr/local/opt/${{matrix.libdir}}/include"
|
|
| 232 |
- OPENSSL_LIBS: "-L/usr/local/opt/${{matrix.libdir}}/lib -lcrypto -lssl"
|
|
| 231 |
+ OPENSSL_CFLAGS: "-I${{matrix.homebrew}}/${{matrix.libdir}}/include"
|
|
| 232 |
+ OPENSSL_LIBS: "-L${{matrix.homebrew}}/${{matrix.libdir}}/lib -lcrypto -lssl"
|
|
| 233 |
+ LZO_CFLAGS: "-I${{matrix.homebrew}}/lzo/include"
|
|
| 234 |
+ LZO_LIBS: "-L${{matrix.homebrew}}/lzo/lib -llzo2"
|
|
| 233 | 235 |
UBSAN_OPTIONS: print_stacktrace=1 |
| 234 | 236 |
steps: |
| 235 | 237 |
- name: Install dependencies |