Skip to content

Commit

Permalink
Merge pull request #114 from creative-commoners/pulls/1.17/php84-behat
Browse files Browse the repository at this point in the history 
ENH Use MySQL 8.4 for the PHP 8.4 endtoend job in CMS 6
  • Loading branch information
@GuySartorelli
GuySartorelli authored Nov 28, 2024
2 parents 9057362 + f60208c commit 1908713
Show file tree
Hide file tree
Showing 2 changed files with 119 additions and 2 deletions.
3 changes: 2 additions & 1 deletion job_creator.php
View file
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
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

0 comments on commit 1908713

Please sign in to comment.