diff options
| author | Ilya Shipitsin <chipitsine@gmail.com> | 2022-10-11 12:10:57 +0500 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2022-10-13 08:53:11 +0200 |
| commit | 14711bdc9a0586fc54df25532b51b8b629dd78ef (patch) | |
| tree | b7720be85d5537b2cf1c5666cf1918a7b79d48a9 /.github | |
| parent | d114f4a68fa771d4dd1dc62430eb9e16a38c9fab (diff) | |
| download | haproxy-14711bdc9a0586fc54df25532b51b8b629dd78ef.tar.gz | |
CI: SSL: use proper version generating when "latest" semantic is used
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
Diffstat (limited to '.github')
| -rwxr-xr-x | .github/matrix.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.github/matrix.py b/.github/matrix.py index 6282767fe..88dbaa8d9 100755 --- a/.github/matrix.py +++ b/.github/matrix.py @@ -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() |