Skip to content

Commit f65a498

Browse files
committed
CI: Add OpenSSL 3.1 builds, including a no-engine build.
(attempt to use 3.2 failed, unsure why) - add OpenSSL build binaries to $PATH Github: closes #415 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1916058 13f79535-47bb-0310-9956-ffa450edef68
1 parent fcaf73d commit f65a498

File tree

3 files changed

+26
-1
lines changed

3 files changed

+26
-1
lines changed

.github/workflows/linux.yml

+23
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,29 @@ jobs:
266266
# APR_VERSION=1.7.0
267267
# APU_VERSION=1.6.3
268268
# APU_CONFIG="--with-crypto --with-ldap"
269+
- name: OpenSSL 3.1 build
270+
config: --enable-mods-shared=most --enable-maintainer-mode --disable-md --disable-http2 --disable-ldap --disable-crypto
271+
env: |
272+
TEST_OPENSSL3=3.1.5
273+
APR_VERSION=1.7.4
274+
APU_VERSION=1.6.3
275+
APU_CONFIG="--without-crypto"
276+
- name: OpenSSL 3.1 -Werror build
277+
config: --enable-mods-shared=most --enable-maintainer-mode --disable-md --disable-http2 --disable-ldap --disable-crypto
278+
notest-cflags: -Werror -O2 -Wno-deprecated-declarations
279+
env: |
280+
TEST_OPENSSL3=3.1.5
281+
APR_VERSION=1.7.4
282+
APU_VERSION=1.6.3
283+
APU_CONFIG="--without-crypto"
284+
- name: OpenSSL 3.1 no-engine build
285+
config: --enable-mods-shared=most --enable-maintainer-mode --disable-md --disable-http2 --disable-ldap --disable-crypto
286+
env: |
287+
TEST_OPENSSL3=3.1.5
288+
OPENSSL_CONFIG=no-engine
289+
APR_VERSION=1.7.4
290+
APU_VERSION=1.6.3
291+
APU_CONFIG="--without-crypto"
269292
runs-on: ubuntu-latest
270293
timeout-minutes: 30
271294
env:

test/travis_before_linux.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ if test -v TEST_OPENSSL3; then
115115
curl "https://www.openssl.org/source/openssl-${TEST_OPENSSL3}.tar.gz" |
116116
tar -xzf -
117117
cd openssl-${TEST_OPENSSL3}
118-
./Configure --prefix=$HOME/root/openssl3 shared no-tests
118+
./Configure --prefix=$HOME/root/openssl3 shared no-tests ${OPENSSL_CONFIG}
119119
make $MFLAGS
120120
make install_sw
121121
touch $HOME/root/openssl-is-${TEST_OPENSSL3}

test/travis_run_linux.sh

+2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ fi
6262
if test -v TEST_OPENSSL3; then
6363
CONFIG="$CONFIG --with-ssl=$HOME/root/openssl3"
6464
export LD_LIBRARY_PATH=$HOME/root/openssl3/lib:$HOME/root/openssl3/lib64
65+
export PATH=$HOME/root/openssl3/bin:$PATH
66+
openssl version
6567
fi
6668

6769
srcdir=$PWD

0 commit comments

Comments
 (0)