From: Arne Schwabe <arne@rfc2549.org>
Date: Wed, 15 Dec 2021 12:34:49 +0000 (+0100)
Subject: Make github actions names nicer, include Ubuntu18+OpenSSL 1.0.2
X-Git-Tag: v2.6_beta1~346
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=919d10ad4a51404a41e594c2b8985647ae1d6b3e;p=thirdparty%2Fopenvpn.git

Make github actions names nicer, include Ubuntu18+OpenSSL 1.0.2

Also let other variants finish if one fails (fail-fast: false)

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

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index e5a4e857b..ea1233b13 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -5,6 +5,7 @@ on: [push, pull_request]
 jobs:
   mingw:
     strategy:
+      fail-fast: false
       matrix:
         include:
           - target: mingw64
@@ -12,6 +13,8 @@ jobs:
           - target: mingw
             chost: i686-w64-mingw32
 
+    name: "gcc-mingw - ${{matrix.target}}"
+
     runs-on: ubuntu-20.04
     env:
       MAKEFLAGS: -j3
@@ -125,14 +128,35 @@ jobs:
 
   ubuntu:
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-18.04, ubuntu-20.04]
-        ssllib: [mbedtls, openssl]
+        sslpkg: [libssl-dev]
+        ssllib: [mbedtls]
+        libname: [mbed TLS]
+
+        include:
+          - os: ubuntu-18.04
+            sslpkg: "libssl1.0-dev"
+            ssllib: openssl
+            libname: OpenSSL 1.0.2
+          - os: ubuntu-18.04
+            sslpkg: "libssl-dev"
+            libname: OpenSSL 1.1.1
+            ssllib: openssl
+          - os: ubuntu-20.04
+            sslpkg: "libssl-dev"
+            libname: OpenSSL 1.1.1
+            ssllib: openssl
+
+    name: "gcc - ${{matrix.os}} - ${{matrix.libname}}"
+    env:
+      SSLPKG: "${{matrix.sslpkg}}"
 
     runs-on: ${{matrix.os}}
     steps:
       - name: Install dependencies
-        run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-dev liblz4-dev linux-libc-dev man2html libcmocka-dev python3-docutils libtool automake autoconf libmbedtls-dev
+        run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-dev liblz4-dev linux-libc-dev man2html libcmocka-dev python3-docutils libtool automake autoconf ${SSLPKG}
       - name: Checkout OpenVPN
         uses: actions/checkout@v2
       - name: autoconf
@@ -146,10 +170,13 @@ jobs:
 
   ubuntu-clang-asan:
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-20.04]
         ssllib: [mbedtls, openssl]
 
+    name: "clang-asan - ${{matrix.os}} - ${{matrix.ssllib}}"
+
     runs-on: ${{matrix.os}}
     steps:
       - name: Install dependencies
@@ -206,6 +233,7 @@ jobs:
 
   msvc:
       strategy:
+        fail-fast: false
         matrix:
           plat: [ARM64, Win32, x64]
           include:
@@ -216,6 +244,7 @@ jobs:
             - plat: x64
               triplet: x64
 
+      name: "msbuild - ${{matrix.triplet}} - openssl"
       env:
         BUILD_CONFIGURATION: Release
         VCPKG_OVERLAY_PORTS: ${{ github.workspace }}/contrib/vcpkg-ports