From c6b34b36ca8e4c5832eb930cc79c04979eccdfc4 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Tue, 20 Jul 2021 23:55:35 +0200 Subject: [PATCH] CI: Install and use OpenSSL 1.1 on CentOS 7. --- .github/workflows/test.yml | 3 ++- .github/workflows/test/run.sh | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a9253ab6..6c6323c8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -131,7 +131,8 @@ jobs: fi yum install -y epel-release yum install -y git binutils make autoconf automake gcc diffutils \ - texinfo netcat procps socat {lzo,zlib,lz4,openssl11,ncurses,readline}-devel + texinfo netcat procps socat {lzo,zlib,lz4,ncurses,readline}-devel + yum install openssl11-devel || yum install openssl-devel if: startsWith(matrix.os, 'centos') || startsWith(matrix.os, 'alma') - name: Install deps (SUSE) diff --git a/.github/workflows/test/run.sh b/.github/workflows/test/run.sh index 74bb8bd6..778d5d3f 100644 --- a/.github/workflows/test/run.sh +++ b/.github/workflows/test/run.sh @@ -28,6 +28,15 @@ run_tests() { header "Running test flavor $flavor" + # CentOS 7 has OpenSSL 1.1 installed in a non-default location. + if test -d /usr/include/openssl11; then + set -- "$@" --with-openssl-include=/usr/include/openssl11 + fi + + if test -d /usr/lib64/openssl11; then + set -- "$@" --with-openssl-lib=/usr/lib64/openssl11 + fi + autoreconf -fsi ./configure "$@" make -j"$(nproc)" -- 2.20.1