]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
CI: SSL: use proper version generating when "latest" semantic is used
authorIlya Shipitsin <chipitsine@gmail.com>
Tue, 11 Oct 2022 07:10:57 +0000 (12:10 +0500)
committerWilly Tarreau <w@1wt.eu>
Thu, 13 Oct 2022 06:53:11 +0000 (08:53 +0200)
both "OPENSSL_VERSION=latest" and "LIBRESSL_VERSION=latest" processing
introduced errors when build-ssl.sh script was invoked. that error
in turn led to skipping custom openssl build and haproxy was linked against
stock openssl, i.e. openssl-1.1.1

.github/matrix.py

index 6282767fe4aa07bc040799b3f286fc17845cdd4a..88dbaa8d965925df641753d4ecef14060acdea9e 100755 (executable)
@@ -42,7 +42,7 @@ def determine_latest_openssl(ssl):
         if "openssl-" in name:
             if name > latest_tag:
                latest_tag = name
-    return "OPENSSL={}".format(latest_tag[8:])
+    return "OPENSSL_VERSION={}".format(latest_tag[8:])
 
 def determine_latest_libressl(ssl):
     libressl_download_list = urllib.request.urlopen("http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/")
@@ -50,7 +50,7 @@ def determine_latest_libressl(ssl):
         decoded_line = line.decode("utf-8")
         if "libressl-" in decoded_line and ".tar.gz.asc" in decoded_line:
              l = re.split("libressl-|.tar.gz.asc", decoded_line)[1]
-    return "LIBRESSL={}".format(l)
+    return "LIBRESSL_VERSION={}".format(l)
 
 def clean_compression(compression):
     return compression.replace("USE_", "").lower()