]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
CI: github: split ssl lib selection based on git branch
authorIlya Shipitsin <chipitsine@gmail.com>
Mon, 12 Dec 2022 14:15:22 +0000 (19:15 +0500)
committerWilliam Lallemand <wlallemand@haproxy.org>
Mon, 12 Dec 2022 15:20:48 +0000 (16:20 +0100)
when *SSL_VERSION="latest" behaviour was introduced, it seems to be fine
for development branches, but too intrusive for stable branches.

let us limit "latest" semantic only for development builds, if branch name
contains "haproxy-" it is supposed to be stable branch, no latest openssl
should be taken

[wla: must be backported as far as 2.6]
Signed-off-by: William Lallemand <wlallemand@haproxy.org>
.github/matrix.py
.github/workflows/vtest.yml

index 98d0a1f2a9ec8c7c0121f2a61f69824a2e997648..fd9491aeeb7782c75a774f79b8d6473fb2e090bc 100755 (executable)
@@ -15,12 +15,12 @@ import re
 from os import environ
 
 if len(sys.argv) == 2:
-    build_type = sys.argv[1]
+    ref_name = sys.argv[1]
 else:
-    print("Usage: {} <build_type>".format(sys.argv[0]), file=sys.stderr)
+    print("Usage: {} <ref_name>".format(sys.argv[0]), file=sys.stderr)
     sys.exit(1)
 
-print("Generating matrix for type '{}'.".format(build_type))
+print("Generating matrix for type '{}'.".format(ref_name))
 
 
 def clean_os(os):
@@ -129,11 +129,9 @@ for CC in ["gcc", "clang"]:
         "stock",
         "OPENSSL_VERSION=1.0.2u",
         "OPENSSL_VERSION=1.1.1s",
-        "OPENSSL_VERSION=latest",
-        "LIBRESSL_VERSION=latest",
         "QUICTLS=yes",
 #        "BORINGSSL=yes",
-    ]:
+    ] + (["OPENSSL_VERSION=latest", "LIBRESSL_VERSION=latest"] if "haproxy-" not in ref_name else []):
         flags = ["USE_OPENSSL=1"]
         if ssl == "BORINGSSL=yes" or ssl == "QUICTLS=yes" or "LIBRESSL" in ssl:
             flags.append("USE_QUIC=1")
index fb7b1d968ada714cea2f43b2c1a992d3f2b6e1e8..a7cdcc51448315ca1a6e49f865b061d8f8291815 100644 (file)
@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Generate Build Matrix
         id: set-matrix
-        run: python3 .github/matrix.py "${{ github.event_name }}"
+        run: python3 .github/matrix.py "${{ github.ref_name }}"
 
   # The Test job actually runs the tests.
   Test: