Browse code

Replace macos11 with macos14 in github runners

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>
(cherry picked from commit 02f0845be7e54e8676e73621e424b6a1540b88b5)

Arne Schwabe authored on 2024/05/02 21:22:31
Showing 1 changed files
... ...
@@ -194,8 +194,16 @@ jobs:
194 194
       matrix:
195 195
         ssllib: [ openssl11, openssl3, libressl]
196 196
         build: [ normal, asan ]
197
-        os: [macos-11, macos-12]
197
+        os: [macos-12, macos-13, macos-14]
198 198
         include:
199
+           # macos14 and newer runners use ARM CPUs and homebrew uses /opt/homebrew/
200
+           # on ARM instead of /usr/local/
201
+          - os: macos-12
202
+            homebrew: /usr/local/opt
203
+          - os: macos-13
204
+            homebrew: /usr/local/opt
205
+          - os: macos-14
206
+            homebrew: /opt/homebrew/opt
199 207
           - build: asan
200 208
             cflags: "-fsanitize=address -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1"
201 209
             ldflags: -fsanitize=address
... ...
@@ -220,8 +228,10 @@ jobs:
220 220
     env:
221 221
       CFLAGS: ${{ matrix.cflags }}
222 222
       LDFLAGS: ${{ matrix.ldflags }}
223
-      OPENSSL_CFLAGS: "-I/usr/local/opt/${{matrix.libdir}}/include"
224
-      OPENSSL_LIBS: "-L/usr/local/opt/${{matrix.libdir}}/lib -lcrypto -lssl"
223
+      OPENSSL_CFLAGS: "-I${{matrix.homebrew}}/${{matrix.libdir}}/include"
224
+      OPENSSL_LIBS: "-L${{matrix.homebrew}}/${{matrix.libdir}}/lib -lcrypto -lssl"
225
+      LZO_CFLAGS: "-I${{matrix.homebrew}}/lzo/include"
226
+      LZO_LIBS: "-L${{matrix.homebrew}}/lzo/lib -llzo2"
225 227
       UBSAN_OPTIONS: print_stacktrace=1
226 228
     steps:
227 229
       - name: Install dependencies