OpenVPN/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2025-05-09 21:51:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace macos11 with macos14 in github runners

Browse Source 
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>
This commit is contained in:
Arne Schwabe 2024-05-02 14:22:31 +02:00 committed by Gert Doering
parent 066fcdba97
commit 02f0845be7
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/build.yaml vendored
View File

@ -202,8 +202,16 @@ jobs:
matrix: matrix:
ssllib: [ openssl11, openssl3, libressl] ssllib: [ openssl11, openssl3, libressl]
build: [ normal, asan ] build: [ normal, asan ]
os: [macos-11, macos-12, macos-13] os: [macos-12, macos-13, macos-14]
include: include:
# macos14 and newer runners use ARM CPUs and homebrew uses /opt/homebrew/
# on ARM instead of /usr/local/
- os: macos-12
homebrew: /usr/local/opt
- os: macos-13
homebrew: /usr/local/opt
- os: macos-14
homebrew: /opt/homebrew/opt
- build: asan - build: asan
cflags: "-fsanitize=address,undefined -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" cflags: "-fsanitize=address,undefined -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1"
ldflags: -fsanitize=address,undefined -fno-sanitize-recover=all ldflags: -fsanitize=address,undefined -fno-sanitize-recover=all
@ -228,8 +236,10 @@ jobs:
env: env:
CFLAGS: ${{ matrix.cflags }} CFLAGS: ${{ matrix.cflags }}
LDFLAGS: ${{ matrix.ldflags }} LDFLAGS: ${{ matrix.ldflags }}
OPENSSL_CFLAGS: "-I/usr/local/opt/${{matrix.libdir}}/include" OPENSSL_CFLAGS: "-I${{matrix.homebrew}}/${{matrix.libdir}}/include"
OPENSSL_LIBS: "-L/usr/local/opt/${{matrix.libdir}}/lib -lcrypto -lssl" OPENSSL_LIBS: "-L${{matrix.homebrew}}/${{matrix.libdir}}/lib -lcrypto -lssl"
LZO_CFLAGS: "-I${{matrix.homebrew}}/lzo/include"
LZO_LIBS: "-L${{matrix.homebrew}}/lzo/lib -llzo2"
UBSAN_OPTIONS: print_stacktrace=1 UBSAN_OPTIONS: print_stacktrace=1
steps: steps:
- name: Install dependencies - name: Install dependencies