From: Joe Orton Date: Mon, 15 Jun 2026 10:02:04 +0000 (+0000) Subject: Merge r1934474 from trunk: [CTR for CI changes] X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=642b90128cdda4febd452196aa96824670a3e943;p=thirdparty%2Fapache%2Fhttpd.git 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) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1935339 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index a1ca4e6e65..d013294e7a 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -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: diff --git a/test/travis_before_linux.sh b/test/travis_before_linux.sh index 5296d08bf9..7e0f24e793 100755 --- a/test/travis_before_linux.sh +++ b/test/travis_before_linux.sh @@ -117,16 +117,6 @@ if ! test -v SKIP_TESTING -o -v NO_TEST_FRAMEWORK; then # 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