split patches attached. Ilya
вт, 11 окт. 2022 г. в 11:08, Willy Tarreau <[email protected]>: > On Tue, Oct 11, 2022 at 10:27:20AM +0500, ???? ??????? wrote: > > I was in doubt whether to split it into 2 patches (because they touch > > single file), > > The principle to keep in mind is that you may want to change your mind > later regarding any of the changes, so if they're independent, they > should be separated, regardless of the fact that they apply to the same > file. > > > ok, I'll do that > > Thank you! > > Willy >
From 96af305de5e5f0b6a8ff82969a2e8fdb5fb51c40 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin <[email protected]> Date: Tue, 11 Oct 2022 12:11:55 +0500 Subject: [PATCH 2/2] CI: SSL: temporarily stick to LibreSSL=3.5.3 recently released 3.6.0 introduced some regression which must be resolved first, let us use 3.5.3 notation instead of "latest" --- .github/matrix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/matrix.py b/.github/matrix.py index 88dbaa8d9..19ae87d79 100755 --- a/.github/matrix.py +++ b/.github/matrix.py @@ -128,7 +128,7 @@ for CC in ["gcc", "clang"]: "stock", "OPENSSL_VERSION=1.0.2u", "OPENSSL_VERSION=latest", - "LIBRESSL_VERSION=latest", + "LIBRESSL_VERSION=3.5.3", "QUICTLS=yes", # "BORINGSSL=yes", ]: -- 2.37.3
From b8630ee145e3edf79770ed9f83f4138d5f4f7f12 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin <[email protected]> Date: Tue, 11 Oct 2022 12:10:57 +0500 Subject: [PATCH 1/2] 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 --- .github/matrix.py | 4 ++-- 1 file 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() -- 2.37.3
