Skip to content

Commit f4de362

Browse files
authored
Merge pull request #4058 from 10up/fix/install-tests-without-svn
Rely only on git instead of svn
2 parents 888b319 + 631d75a commit f4de362

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

bin/install-wp-tests.sh

+16-10
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ download() {
2828
fi
2929
}
3030

31-
# Check if svn is installed
32-
check_svn_installed() {
33-
if ! command -v svn > /dev/null; then
34-
echo "Error: svn is not installed. Please install svn and try again."
31+
# Check if git is installed
32+
check_git_installed() {
33+
if ! command -v git > /dev/null; then
34+
echo "Error: git is not installed. Please install git and try again."
3535
exit 1
3636
fi
3737
}
@@ -50,6 +50,7 @@ elif [[ $WP_VERSION =~ [0-9]+\.[0-9]+\.[0-9]+ ]]; then
5050
WP_TESTS_TAG="tags/$WP_VERSION"
5151
fi
5252
elif [[ $WP_VERSION == 'nightly' || $WP_VERSION == 'trunk' ]]; then
53+
WP_BRANCH="trunk"
5354
WP_TESTS_TAG="trunk"
5455
else
5556
# http serves a single offer, whereas https serves multiple. we only want one
@@ -60,6 +61,7 @@ else
6061
echo "Latest WordPress version could not be found"
6162
exit 1
6263
fi
64+
WP_BRANCH=$LATEST_VERSION
6365
WP_TESTS_TAG="tags/$LATEST_VERSION"
6466
fi
6567
set -ex
@@ -75,8 +77,9 @@ install_wp() {
7577
if [[ $WP_VERSION == 'nightly' || $WP_VERSION == 'trunk' ]]; then
7678
mkdir -p $TMPDIR/wordpress-trunk
7779
rm -rf $TMPDIR/wordpress-trunk/*
78-
check_svn_installed
79-
svn export --quiet https://core.svn.wordpress.org/trunk $TMPDIR/wordpress-trunk/wordpress
80+
check_git_installed
81+
git clone --depth 1 --branch master https://github.com/wordpress/wordpress $TMPDIR/wordpress-trunk/wordpress
82+
rm -r $TMPDIR/wordpress-trunk/wordpress/.git
8083
mv $TMPDIR/wordpress-trunk/wordpress/* $WP_CORE_DIR
8184
else
8285
if [ $WP_VERSION == 'latest' ]; then
@@ -120,13 +123,16 @@ install_test_suite() {
120123
# set up testing suite
121124
mkdir -p $WP_TESTS_DIR
122125
rm -rf $WP_TESTS_DIR/{includes,data}
123-
check_svn_installed
124-
svn export --quiet --ignore-externals https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/includes/ $WP_TESTS_DIR/includes
125-
svn export --quiet --ignore-externals https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/data/ $WP_TESTS_DIR/data
126+
check_git_installed
127+
git clone --depth 1 --branch $WP_BRANCH https://github.com/wordpress/wordpress-develop $TMPDIR/wordpress-develop
128+
rm -r $TMPDIR/wordpress-develop/.git
129+
mv $TMPDIR/wordpress-develop/tests/phpunit/includes/ $WP_TESTS_DIR/includes
130+
mv $TMPDIR/wordpress-develop/tests/phpunit/data/ $WP_TESTS_DIR/data
131+
rm -r $TMPDIR/wordpress-develop
126132
fi
127133

128134
if [ ! -f wp-tests-config.php ]; then
129-
download https://develop.svn.wordpress.org/${WP_TESTS_TAG}/wp-tests-config-sample.php "$WP_TESTS_DIR"/wp-tests-config.php
135+
download https://raw.githubusercontent.com/wordpress/wordpress-develop/${WP_BRANCH}/wp-tests-config-sample.php "$WP_TESTS_DIR"/wp-tests-config.php
130136
# remove all forward slashes in the end
131137
WP_CORE_DIR=$(echo $WP_CORE_DIR | sed "s:/\+$::")
132138
sed $ioption "s:dirname( __FILE__ ) . '/src/':'$WP_CORE_DIR/':" "$WP_TESTS_DIR"/wp-tests-config.php

0 commit comments

Comments
 (0)