diff --git a/consts.php b/consts.php index cd252c1..2801643 100644 --- a/consts.php +++ b/consts.php @@ -41,6 +41,7 @@ const DB_MYSQL_57_PDO = 'mysql57pdo'; const DB_MYSQL_80 = 'mysql80'; const DB_PGSQL = 'pgsql'; +const DB_MARIADB = 'mariadb'; // Used when determining the version of installer to used. Intentionally doesn't include recipes const LOCKSTEPPED_REPOS = [ diff --git a/job_creator.php b/job_creator.php index d1e5c6f..96b56f9 100644 --- a/job_creator.php +++ b/job_creator.php @@ -348,6 +348,7 @@ private function createPhpunitJobs( } else { $matrix['include'][] = $this->createJob(0, [ 'composer_args' => '--prefer-lowest', + 'db' => DB_MYSQL_57, 'phpunit' => true, 'phpunit_suite' => $suite, ]); @@ -369,7 +370,7 @@ private function createPhpunitJobs( ]); } elseif ($this->getCmsMajor() === '5') { $matrix['include'][] = $this->createJob(0, [ - 'db' => DB_MYSQL_57, + 'db' => DB_MARIADB, 'phpunit' => true, 'phpunit_suite' => $suite, ]); diff --git a/tests/JobCreatorTest.php b/tests/JobCreatorTest.php index d26336d..927c4fe 100644 --- a/tests/JobCreatorTest.php +++ b/tests/JobCreatorTest.php @@ -264,7 +264,7 @@ public function provideCreateJson(): array [ 'installer_version' => '5.x-dev', 'php' => '8.1', - 'db' => DB_MYSQL_57, + 'db' => DB_MARIADB, 'composer_require_extra' => '', 'composer_args' => '', 'name_suffix' => '', @@ -276,7 +276,7 @@ public function provideCreateJson(): array 'endtoend_suite' => 'root', 'endtoend_config' => '', 'js' => 'false', - 'name' => '8.1 mysql57 phpunit all', + 'name' => '8.1 mariadb phpunit all', ], [ 'installer_version' => '5.x-dev', @@ -771,7 +771,7 @@ public function provideComposerInstall(): array '5.x-dev', [ '8.1 prf-low mysql57 phpunit all', - '8.1 mysql57 phpunit all', + '8.1 mariadb phpunit all', '8.2 mysql80 phpunit all' ] ], @@ -781,7 +781,7 @@ public function provideComposerInstall(): array '5.x-dev', [ '8.1 prf-low mysql57 phpunit all', - '8.1 mysql57 phpunit all', + '8.1 mariadb phpunit all', '8.2 mysql80 phpunit all' ] ], @@ -791,7 +791,7 @@ public function provideComposerInstall(): array '5.x-dev', [ '8.1 prf-low mysql57 phpunit all', - '8.1 mysql57 phpunit all', + '8.1 mariadb phpunit all', '8.2 mysql80 phpunit all' ] ],