diff mbox series

[Openvpn-devel,2/2] Include libressl and macOS 12 to macOS github actions

Message ID 20220822184147.281142-2-arne@rfc2549.org
State Accepted
Headers show
Series [Openvpn-devel,1/2] Github Actions: Add libreSSL actions | expand

Commit Message

Arne Schwabe Aug. 22, 2022, 8:41 a.m. UTC 
Signed-off-by: Arne Schwabe <arne@rfc2549.org>
---
 .github/workflows/build.yaml | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

Comments

Gert Doering Aug. 22, 2022, 9:28 a.m. UTC | #1 
Acked-by: Gert Doering <gert@greenie.muc.de>

Same thing, "looks reasonable and all green on my github repo" :-)

Your patch has been applied to the master branch.

commit c0724527190d864b20fb3f5725ebdcadd8900697
Author: Arne Schwabe
Date:   Mon Aug 22 20:41:47 2022 +0200

     Include libressl and macOS 12 to macOS github actions

     Signed-off-by: Arne Schwabe <arne@rfc2549.org>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20220822184147.281142-2-arne@rfc2549.org>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg25065.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering
diff mbox series

Patch

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