Skip to content

Commit 642b901

Browse files
committed
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
1 parent 2ca1dd9 commit 642b901

2 files changed

Lines changed: 6 additions & 10 deletions

File tree

.github/workflows/linux.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,12 @@ jobs:
340340
libnghttp2-dev libjansson-dev libpcre2-dev gdb
341341
perl-doc libsasl2-dev ${{ matrix.pkgs }}
342342
- uses: actions/checkout@v4
343+
- uses: actions/checkout@v6
344+
with:
345+
repository: apache/httpd-tests
346+
path: test/perl-framework
347+
submodules: true
348+
if: ${{ ! ( env.SKIP_TESTING || env.NO_TEST_FRAMEWORK ) }}
343349
- name: Cache installed libraries
344350
uses: actions/cache@v4
345351
with:

test/travis_before_linux.sh

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -117,16 +117,6 @@ if ! test -v SKIP_TESTING -o -v NO_TEST_FRAMEWORK; then
117117

118118
# Cache the perl -V output for future verification.
119119
mv perlver ~/perl5/.perlver
120-
121-
# Make a shallow clone of httpd-tests git repo.
122-
git clone -q --depth=1 https://github.com/apache/httpd-tests.git test/perl-framework
123-
124-
# For OpenSSL 3.2+ testing, Apache::Test r1916067 is required, so
125-
# use a checkout of trunk until there is an updated CPAN release
126-
# with that revision.
127-
if test -v TEST_OPENSSL3; then
128-
svn co -q https://svn.apache.org/repos/asf/perl/Apache-Test/trunk test/perl-framework/Apache-Test
129-
fi
130120
fi
131121

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

0 commit comments

Comments
 (0)