svn commit: r1935339 - in httpd/httpd/branches/2.4.x: . .github/workflows test

Author: jorton
Date: Mon Jun 15 10:02:04 2026
New Revision: 1935339

Log:
Merge r1934474 from trunk: [CTR for CI changes]

CI: Use the apache/httpd-tests github repos for the Perl framework.
(last dependency on use of svn in CI is removed)

Modified:
   httpd/httpd/branches/2.4.x/   (props changed)
   httpd/httpd/branches/2.4.x/.github/workflows/linux.yml
   httpd/httpd/branches/2.4.x/test/   (props changed)
   httpd/httpd/branches/2.4.x/test/travis_before_linux.sh

Modified: httpd/httpd/branches/2.4.x/.github/workflows/linux.yml
==============================================================================
--- httpd/httpd/branches/2.4.x/.github/workflows/linux.yml	Mon Jun 15 09:55:45 2026	(r1935338)
+++ httpd/httpd/branches/2.4.x/.github/workflows/linux.yml	Mon Jun 15 10:02:04 2026	(r1935339)
@@ -340,6 +340,12 @@ jobs:
                     libnghttp2-dev libjansson-dev libpcre2-dev gdb
                     perl-doc libsasl2-dev ${{ matrix.pkgs }}
     - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        repository: apache/httpd-tests
+        path: test/perl-framework
+        submodules: true
+      if: ${{ ! ( env.SKIP_TESTING || env.NO_TEST_FRAMEWORK ) }}
     - name: Cache installed libraries
       uses: actions/cache@v4
       with:

Modified: httpd/httpd/branches/2.4.x/test/travis_before_linux.sh
==============================================================================
--- httpd/httpd/branches/2.4.x/test/travis_before_linux.sh	Mon Jun 15 09:55:45 2026	(r1935338)
+++ httpd/httpd/branches/2.4.x/test/travis_before_linux.sh	Mon Jun 15 10:02:04 2026	(r1935339)
@@ -117,16 +117,6 @@ if ! test -v SKIP_TESTING -o -v NO_TEST_
 
     # Cache the perl -V output for future verification.
     mv perlver ~/perl5/.perlver
-
-    # 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