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

ENH Use MySQL 8.4 for the PHP 8.4 endtoend job in CMS 6 #114

Merged
merged 1 commit into from
Nov 28, 2024
Merged

ENH Use MySQL 8.4 for the PHP 8.4 endtoend job in CMS 6 #114

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
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 @@ -528,8 +528,9 @@ private function buildDynamicMatrix(
}
$matrix['include'][] = $job;
if (!$simpleMatrix && !$composerInstall) {
$db = $cmsMajor == 5 ? DB_MYSQL_80 : DB_MYSQL_84;
$matrix['include'][] = $this->createJob(3, [
'db' => DB_MYSQL_80,
'db' => $db,
'endtoend' => true,
'endtoend_suite' => 'root',
'endtoend_tags' => $jobTag,
Expand Down
118 changes: 117 additions & 1 deletion tests/JobCreatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ public function testCreateJson(
public function provideCreateJson(): array
{
return [
// behat without @job1/@job2 test
// behat without @job1/@job2 test - cms 5
[
implode("\n", [
$this->getGenericYml(),
Expand Down Expand Up @@ -394,6 +394,122 @@ public function provideCreateJson(): array
],
]
],
// behat without @job1/@job2 test - cms 6
[
implode("\n", [
$this->getGenericYml(),
<<<EOT
github_repository: 'myaccount/silverstripe-framework'
github_my_ref: '6'
parent_branch: ''
EOT
]),
true,
false,
false,
[
[
'installer_version' => '6.x-dev',
'php' => '8.3',
'db' => DB_MARIADB,
'composer_require_extra' => '',
'composer_args' => '--prefer-lowest',
'name_suffix' => '',
'phpunit' => 'true',
'phpunit_suite' => 'all',
'phplinting' => 'false',
'phpcoverage' => 'false',
'endtoend' => 'false',
'endtoend_suite' => 'root',
'endtoend_config' => '',
'endtoend_tags' => '',
'js' => 'false',
'doclinting' => 'false',
'needs_full_setup' => 'true',
'name' => '8.3 prf-low mariadb phpunit all',
],
[
'installer_version' => '6.x-dev',
'php' => '8.3',
'db' => DB_MYSQL_80,
'composer_require_extra' => '',
'composer_args' => '',
'name_suffix' => '',
'phpunit' => 'true',
'phpunit_suite' => 'all',
'phplinting' => 'false',
'phpcoverage' => 'false',
'endtoend' => 'false',
'endtoend_suite' => 'root',
'endtoend_config' => '',
'endtoend_tags' => '',
'js' => 'false',
'doclinting' => 'false',
'needs_full_setup' => 'true',
'name' => '8.3 mysql80 phpunit all',
],
[
'installer_version' => '6.x-dev',
'php' => '8.4',
'db' => DB_MYSQL_84,
'composer_require_extra' => '',
'composer_args' => '',
'name_suffix' => '',
'phpunit' => 'true',
'phpunit_suite' => 'all',
'phplinting' => 'false',
'phpcoverage' => 'false',
'endtoend' => 'false',
'endtoend_suite' => 'root',
'endtoend_config' => '',
'endtoend_tags' => '',
'js' => 'false',
'doclinting' => 'false',
'needs_full_setup' => 'true',
'name' => '8.4 mysql84 phpunit all',
],
[
'installer_version' => '6.x-dev',
'php' => '8.3',
'db' => DB_MYSQL_80,
'composer_require_extra' => '',
'composer_args' => '',
'name_suffix' => '',
'phpunit' => 'false',
'phpunit_suite' => 'all',
'phplinting' => 'false',
'phpcoverage' => 'false',
'endtoend' => 'true',
'endtoend_suite' => 'root',
'endtoend_config' => '',
'endtoend_tags' => '',
'js' => 'false',
'doclinting' => 'false',
'needs_full_setup' => 'true',
'name' => '8.3 mysql80 endtoend root',
],
[
'installer_version' => '6.x-dev',
'php' => '8.4',
'db' => DB_MYSQL_84,
'composer_require_extra' => '',
'composer_args' => '',
'name_suffix' => '',
'phpunit' => 'false',
'phpunit_suite' => 'all',
'phplinting' => 'false',
'phpcoverage' => 'false',
'endtoend' => 'true',
'endtoend_suite' => 'root',
'endtoend_config' => '',
'endtoend_tags' => '',
'js' => 'false',
'doclinting' => 'false',
'needs_full_setup' => 'true',
'name' => '8.4 mysql84 endtoend root',
],
]
],
// behat with @job1/@job2 test
[
implode("\n", [
Expand Down