Signed-off-by: Arne Schwabe <a...@rfc2549.org>
---
.github/workflows/build.yaml | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index dfa3953f0..6c2c3ef3e 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -261,12 +261,12 @@ jobs:
run: make check
macos:
- runs-on: macos-latest
strategy:
fail-fast: false
matrix:
- ossl: [ 1.1, 3 ]
+ ssllib: [ openssl11, openssl3, libressl]
build: [ normal, asan ]
+ os: [macos-11, macos-12]
include:
- build: asan
cflags: "-fsanitize=address -fno-optimize-sibling-calls
-fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1"
@@ -277,22 +277,32 @@ jobs:
cflags: "-O2 -g"
ldflags: ""
configureflags: ""
+ - ssllib: openssl11
+ libdir: openssl@1.1
+ configuressllib: ""
+ - ssllib: openssl3
+ libdir: openssl@3
+ configuressllib: ""
+ - ssllib: libressl
+ libdir: libressl
+ configuressllib: "--with-openssl-engine=no"
- name: "macOS - OpenSSL ${{matrix.ossl}} - ${{matrix.build}}"
+ runs-on: ${{matrix.os}}
+ name: "${{matrix.os}} - ${{matrix.libdir}} - ${{matrix.build}}"
env:
CFLAGS: ${{ matrix.cflags }}
LDFLAGS: ${{ matrix.ldflags }}
- OPENSSL_CFLAGS: -I/usr/local/opt/openssl@${{matrix.ossl}}/include
- OPENSSL_LIBS: "-L/usr/local/opt/openssl@${{matrix.ossl}}/lib -lcrypto
-lssl"
+ OPENSSL_CFLAGS: "-I/usr/local/opt/${{matrix.libdir}}/include"
+ OPENSSL_LIBS: "-L/usr/local/opt/${{matrix.libdir}}/lib -lcrypto -lssl"
steps:
- name: Install dependencies
- run: brew install openssl@1.1 openssl@3 lzo lz4 man2html cmocka
libtool automake autoconf
+ run: brew install openssl@1.1 openssl@3 lzo lz4 man2html cmocka
libtool automake autoconf libressl
- name: Checkout OpenVPN
uses: actions/checkout@v3
- name: autoconf
run: autoreconf -fvi
- name: configure
- run: ./configure ${{matrix.configureflags}}
+ run: ./configure ${{matrix.configureflags}} ${{matrix.configuressllib}}
- name: make all
run: make -j4
- name: make check
--
2.32.1 (Apple Git-133)
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
