From cc7c6801945c6a7373553b78bd899ce09681ec0a Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Tue, 7 Sep 2021 20:04:55 +0300 Subject: bpo-38820: Test with OpenSSL 3.0.0 final (GH-28205) Signed-off-by: Christian Heimes --- .github/workflows/build.yml | 2 +- Tools/ssl/multissltests.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 27e07a5..1ed35b5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -185,7 +185,7 @@ jobs: strategy: fail-fast: false matrix: - openssl_ver: [1.1.1l, 3.0.0-beta1] + openssl_ver: [1.1.1l, 3.0.0] env: OPENSSL_VER: ${{ matrix.openssl_ver }} MULTISSL_DIR: ${{ github.workspace }}/multissl diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py index 9b46c8c..7bdfd0b 100755 --- a/Tools/ssl/multissltests.py +++ b/Tools/ssl/multissltests.py @@ -48,7 +48,7 @@ OPENSSL_OLD_VERSIONS = [ OPENSSL_RECENT_VERSIONS = [ "1.1.1l", - "3.0.0-beta1" + "3.0.0" ] LIBRESSL_OLD_VERSIONS = [ @@ -412,6 +412,10 @@ class BuildOpenSSL(AbstractBuilder): ["make", "-j1", "install_ssldirs", "install_fips"], cwd=self.build_dir ) + if not os.path.isdir(self.lib_dir): + # 3.0.0-beta2 uses lib64 on 64 bit platforms + lib64 = self.lib_dir + "64" + os.symlink(lib64, self.lib_dir) @property def short_version(self): -- cgit v0.12