Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MNT Add MariaDB support #73

Merged
merged 1 commit into from
Nov 6, 2023
+8 −6
Merged

MNT Add MariaDB support #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions consts.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
3 changes: 2 additions & 1 deletion job_creator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
]);
Expand All @@ -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,
]);
Expand Down
10 changes: 5 additions & 5 deletions tests/JobCreatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' => '',
Expand All @@ -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',
Expand Down Expand Up @@ -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'
]
],
Expand 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'
]
],
Expand 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'
]
],
Expand Down