From bf5250de7b08e086f1594243191e9005aefed775 Mon Sep 17 00:00:00 2001
From: Rich Kuzsma <62522248+richkuz@users.noreply.github.com>
Date: Tue, 20 Oct 2020 14:59:32 -0400
Subject: [PATCH] Fix CI build (#60)

* Fix CI build
Following suggestions at https://discuss.circleci.com/t/build-failing-everytime-docker-wordpress-mysql-php-the-following-packages-have-unmet-dependencies/35861/2

* Fix flaxy tests
Per https://meta.trac.wordpress.org/ticket/4869#comment:1 , svn may be rate limited. --ignore-externals should mitigate the problem.
---
 .circleci/config.yml        | 3 +--
 scripts/install-wp-tests.sh | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 990b1a5..9d799e5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -24,8 +24,7 @@ job-references:
     command: |
       sudo apt-get update && sudo apt-get install subversion
       sudo -E docker-php-ext-install mysqli
-      sudo sh -c "printf '\ndeb http://ftp.us.debian.org/debian sid main\n' >> /etc/apt/sources.list"
-      sudo apt-get update && sudo apt-get install mysql-client-5.7
+      sudo apt-get update && sudo apt-get install default-mysql-client
 
   php_job: &php_job
     environment:
diff --git a/scripts/install-wp-tests.sh b/scripts/install-wp-tests.sh
index b53b972..2e0e99f 100755
--- a/scripts/install-wp-tests.sh
+++ b/scripts/install-wp-tests.sh
@@ -107,8 +107,8 @@ install_test_suite() {
     if [ ! -d $WP_TESTS_DIR ]; then
         # set up testing suite
         mkdir -p $WP_TESTS_DIR
-        svn co --quiet https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/includes/ $WP_TESTS_DIR/includes
-        svn co --quiet https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/data/ $WP_TESTS_DIR/data
+        svn co --ignore-externals https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/includes/ $WP_TESTS_DIR/includes
+        svn co --ignore-externals https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/data/ $WP_TESTS_DIR/data
     fi
 
     if [ ! -f wp-tests-config.php ]; then