Skip to content

Commit 2361315

Browse files
committed
CI: add OpenSSL 3.2, test OpenSSL 3.x using Apache::Test
trunk to pick up r1916067. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1916068 13f79535-47bb-0310-9956-ffa450edef68
1 parent fed3652 commit 2361315

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

.github/workflows/linux.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -267,27 +267,27 @@ jobs:
267267
# APU_VERSION=1.6.3
268268
# APU_CONFIG="--with-crypto --with-ldap"
269269
# -------------------------------------------------------------------------
270-
- name: OpenSSL 3.1 build
270+
- name: OpenSSL 3.1
271271
config: --enable-mods-shared=most --enable-maintainer-mode --disable-md --disable-http2 --disable-ldap --disable-crypto
272272
env: |
273273
TEST_OPENSSL3=3.1.5
274274
APR_VERSION=1.7.4
275275
APU_VERSION=1.6.3
276276
APU_CONFIG="--without-crypto"
277277
# -------------------------------------------------------------------------
278-
- name: OpenSSL 3.1 -Werror build
278+
- name: OpenSSL 3.2 -Werror
279279
config: --enable-mods-shared=most --enable-maintainer-mode --disable-md --disable-http2 --disable-ldap --disable-crypto
280280
notest-cflags: -Werror -O2 -Wno-deprecated-declarations
281281
env: |
282-
TEST_OPENSSL3=3.1.5
282+
TEST_OPENSSL3=3.2.1
283283
APR_VERSION=1.7.4
284284
APU_VERSION=1.6.3
285285
APU_CONFIG="--without-crypto"
286286
# -------------------------------------------------------------------------
287-
- name: OpenSSL 3.1 no-engine build
287+
- name: OpenSSL 3.2 no-engine
288288
config: --enable-mods-shared=most --enable-maintainer-mode --disable-md --disable-http2 --disable-ldap --disable-crypto
289289
env: |
290-
TEST_OPENSSL3=3.1.5
290+
TEST_OPENSSL3=3.2.1
291291
OPENSSL_CONFIG=no-engine
292292
APR_VERSION=1.7.4
293293
APU_VERSION=1.6.3

test/travis_before_linux.sh

+7
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,13 @@ if ! test -v SKIP_TESTING -o -v NO_TEST_FRAMEWORK; then
8585

8686
# Make a shallow clone of httpd-tests git repo.
8787
git clone -q --depth=1 https://github.com/apache/httpd-tests.git test/perl-framework
88+
89+
# For OpenSSL 3.2+ testing, Apache::Test r1916067 is required, so
90+
# use a checkout of trunk until there is an updated CPAN release
91+
# with that revision.
92+
if test -v TEST_OPENSSL3; then
93+
svn co -q https://svn.apache.org/repos/asf/perl/Apache-Test/trunk test/perl-framework/Apache-Test
94+
fi
8895
fi
8996

9097
# For LDAP testing, run slapd listening on port 8389 and populate the

0 commit comments

Comments
 (0)