Skip to content

Commit a221296

Browse files
authored
ci: add OpenSSL 4.0 to source-built matrix (#886)
Convert the OpenSSL 3.5 job into a matrix that builds OpenSSL from source for both 3.5.7 and 4.0.1, since neither version is packaged in Ubuntu 24.04.
1 parent 9538c2c commit a221296

1 file changed

Lines changed: 21 additions & 11 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,23 +75,33 @@ jobs:
7575
run: |
7676
make check || (find . -name test-suite.log -exec cat {} \; && false)
7777
78-
linux_ossl_35:
79-
name: Linux with OpenSSL 3.5.6
78+
linux_ossl_source:
79+
name: Linux with OpenSSL ${{ matrix.version }}
8080
runs-on: ubuntu-24.04
81+
strategy:
82+
fail-fast: false
83+
matrix:
84+
include:
85+
- version: "3.5.7"
86+
sha256: "a8c0d28a529ca480f9f36cf5792e2cd21984552a3c8e4aa11a24aa31aeac98e8"
87+
dir: /usr/local/openssl-3.5
88+
- version: "4.0.1"
89+
sha256: "2db3f3a0d6ea4b59e1f094ace2c8cd536dffb87cdc39084c5afa1e6f7f37dd09"
90+
dir: /usr/local/openssl-4.0
8191
steps:
8292
- uses: actions/checkout@v6
8393
- name: Prepare
8494
env:
85-
OPENSSL_VERSION: 3.5.6
86-
OPENSSL_SHA256: "deae7c80cba99c4b4f940ecadb3c3338b13cb77418409238e57d7f31f2a3b736"
87-
OPENSSL_INSTALL_DIR: /usr/local/openssl-3.5
88-
LDFLAGS: "-Wl,-rpath,/usr/local/openssl-3.5/lib64 -L/usr/local/openssl-3.5/lib64"
89-
PKG_CONFIG_PATH: "/usr/local/openssl-3.5/lib64/pkgconfig"
95+
OPENSSL_VERSION: ${{ matrix.version }}
96+
OPENSSL_SHA256: ${{ matrix.sha256 }}
97+
OPENSSL_INSTALL_DIR: ${{ matrix.dir }}
98+
LDFLAGS: "-Wl,-rpath,${{ matrix.dir }}/lib64 -L${{ matrix.dir }}/lib64"
99+
PKG_CONFIG_PATH: "${{ matrix.dir }}/lib64/pkgconfig"
90100
run: |
91101
set -x
92102
sudo apt-get update -qq
93103
sudo apt-get install -y libcppunit-dev p11-kit build-essential checkinstall zlib1g-dev sudo autoconf libtool git
94-
# Install OpenSSL 3.5
104+
# Install OpenSSL from source
95105
curl -L -O https://github.com/openssl/openssl/releases/download/openssl-${{ env.OPENSSL_VERSION }}/openssl-${{ env.OPENSSL_VERSION }}.tar.gz
96106
echo "${OPENSSL_SHA256} openssl-${{ env.OPENSSL_VERSION }}.tar.gz" | sha256sum -c -
97107
tar -xf openssl-${{ env.OPENSSL_VERSION }}.tar.gz
@@ -105,9 +115,9 @@ jobs:
105115
env:
106116
# Once all OpenSSL deprecations fixed, uncomment this
107117
# CXXFLAGS: -Werror
108-
OPENSSL_INSTALL_DIR: /usr/local/openssl-3.5
109-
LDFLAGS: "-Wl,-rpath,/usr/local/openssl-3.5/lib64 -L/usr/local/openssl-3.5/lib64"
110-
PKG_CONFIG_PATH: "/usr/local/openssl-3.5/lib64/pkgconfig"
118+
OPENSSL_INSTALL_DIR: ${{ matrix.dir }}
119+
LDFLAGS: "-Wl,-rpath,${{ matrix.dir }}/lib64 -L${{ matrix.dir }}/lib64"
120+
PKG_CONFIG_PATH: "${{ matrix.dir }}/lib64/pkgconfig"
111121
run: |
112122
set -x
113123
./autogen.sh

0 commit comments

Comments
 (0)