]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
CI: add OpenSSL 3.2, test OpenSSL 3.x using Apache::Test
authorJoe Orton <jorton@apache.org>
Fri, 1 Mar 2024 10:15:13 +0000 (10:15 +0000)
committerJoe Orton <jorton@apache.org>
Fri, 1 Mar 2024 10:15:13 +0000 (10:15 +0000)
trunk to pick up r1916067.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1916068 13f79535-47bb-0310-9956-ffa450edef68

.github/workflows/linux.yml
test/travis_before_linux.sh

index a8500d2d9e03e783b2e4cd808fdaf881e9c862b1..0e716bc9fac0d1e27c984b9d45431ffb048ef4cb 100644 (file)
@@ -267,7 +267,7 @@ jobs:
           #     APU_VERSION=1.6.3
           # APU_CONFIG="--with-crypto --with-ldap"
           # -------------------------------------------------------------------------
-          - name: OpenSSL 3.1 build
+          - name: OpenSSL 3.1
             config: --enable-mods-shared=most --enable-maintainer-mode --disable-md --disable-http2 --disable-ldap --disable-crypto
             env: |
               TEST_OPENSSL3=3.1.5
@@ -275,19 +275,19 @@ jobs:
               APU_VERSION=1.6.3
               APU_CONFIG="--without-crypto"
           # -------------------------------------------------------------------------
-          - name: OpenSSL 3.1 -Werror build
+          - name: OpenSSL 3.2 -Werror
             config: --enable-mods-shared=most --enable-maintainer-mode --disable-md --disable-http2 --disable-ldap --disable-crypto
             notest-cflags: -Werror -O2 -Wno-deprecated-declarations
             env: |
-              TEST_OPENSSL3=3.1.5
+              TEST_OPENSSL3=3.2.1
               APR_VERSION=1.7.4
               APU_VERSION=1.6.3
               APU_CONFIG="--without-crypto"
           # -------------------------------------------------------------------------
-          - name: OpenSSL 3.1 no-engine build
+          - name: OpenSSL 3.2 no-engine
             config: --enable-mods-shared=most --enable-maintainer-mode --disable-md --disable-http2 --disable-ldap --disable-crypto
             env: |
-              TEST_OPENSSL3=3.1.5
+              TEST_OPENSSL3=3.2.1
               OPENSSL_CONFIG=no-engine
               APR_VERSION=1.7.4
               APU_VERSION=1.6.3
index e67931847baf41d1726a9dca53f0e3bc63034f83..32fbbb8b9099a63cb048e8183c97d7d056ca2808 100755 (executable)
@@ -85,6 +85,13 @@ if ! test -v SKIP_TESTING -o -v NO_TEST_FRAMEWORK; then
 
     # Make a shallow clone of httpd-tests git repo.
     git clone -q --depth=1 https://github.com/apache/httpd-tests.git test/perl-framework
+
+    # For OpenSSL 3.2+ testing, Apache::Test r1916067 is required, so
+    # use a checkout of trunk until there is an updated CPAN release
+    # with that revision.
+    if test -v TEST_OPENSSL3; then
+       svn co -q https://svn.apache.org/repos/asf/perl/Apache-Test/trunk test/perl-framework/Apache-Test
+    fi
 fi
 
 # For LDAP testing, run slapd listening on port 8389 and populate the