Skip to content

Commit 1908713

Browse files
GuySartorelliGuySartorelli
authored
Merge pull request #114 from creative-commoners/pulls/1.17/php84-behat
ENH Use MySQL 8.4 for the PHP 8.4 endtoend job in CMS 6
2 parents 9057362 + f60208c commit 1908713

File tree

2 files changed

+119
-2
lines changed

2 files changed

+119
-2
lines changed

‎job_creator.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -528,8 +528,9 @@ private function buildDynamicMatrix(
528528
}
529529
$matrix['include'][] = $job;
530530
if (!$simpleMatrix && !$composerInstall) {
531+
$db = $cmsMajor == 5 ? DB_MYSQL_80 : DB_MYSQL_84;
531532
$matrix['include'][] = $this->createJob(3, [
532-
'db' => DB_MYSQL_80,
533+
'db' => $db,
533534
'endtoend' => true,
534535
'endtoend_suite' => 'root',
535536
'endtoend_tags' => $jobTag,

‎tests/JobCreatorTest.php

+117-1
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ public function testCreateJson(
258258
public function provideCreateJson(): array
259259
{
260260
return [
261-
// behat without @job1/@job2 test
261+
// behat without @job1/@job2 test - cms 5
262262
[
263263
implode("\n", [
264264
$this->getGenericYml(),
@@ -394,6 +394,122 @@ public function provideCreateJson(): array
394394
],
395395
]
396396
],
397+
// behat without @job1/@job2 test - cms 6
398+
[
399+
implode("\n", [
400+
$this->getGenericYml(),
401+
<<<EOT
402+
github_repository: 'myaccount/silverstripe-framework'
403+
github_my_ref: '6'
404+
parent_branch: ''
405+
EOT
406+
]),
407+
true,
408+
false,
409+
false,
410+
[
411+
[
412+
'installer_version' => '6.x-dev',
413+
'php' => '8.3',
414+
'db' => DB_MARIADB,
415+
'composer_require_extra' => '',
416+
'composer_args' => '--prefer-lowest',
417+
'name_suffix' => '',
418+
'phpunit' => 'true',
419+
'phpunit_suite' => 'all',
420+
'phplinting' => 'false',
421+
'phpcoverage' => 'false',
422+
'endtoend' => 'false',
423+
'endtoend_suite' => 'root',
424+
'endtoend_config' => '',
425+
'endtoend_tags' => '',
426+
'js' => 'false',
427+
'doclinting' => 'false',
428+
'needs_full_setup' => 'true',
429+
'name' => '8.3 prf-low mariadb phpunit all',
430+
],
431+
[
432+
'installer_version' => '6.x-dev',
433+
'php' => '8.3',
434+
'db' => DB_MYSQL_80,
435+
'composer_require_extra' => '',
436+
'composer_args' => '',
437+
'name_suffix' => '',
438+
'phpunit' => 'true',
439+
'phpunit_suite' => 'all',
440+
'phplinting' => 'false',
441+
'phpcoverage' => 'false',
442+
'endtoend' => 'false',
443+
'endtoend_suite' => 'root',
444+
'endtoend_config' => '',
445+
'endtoend_tags' => '',
446+
'js' => 'false',
447+
'doclinting' => 'false',
448+
'needs_full_setup' => 'true',
449+
'name' => '8.3 mysql80 phpunit all',
450+
],
451+
[
452+
'installer_version' => '6.x-dev',
453+
'php' => '8.4',
454+
'db' => DB_MYSQL_84,
455+
'composer_require_extra' => '',
456+
'composer_args' => '',
457+
'name_suffix' => '',
458+
'phpunit' => 'true',
459+
'phpunit_suite' => 'all',
460+
'phplinting' => 'false',
461+
'phpcoverage' => 'false',
462+
'endtoend' => 'false',
463+
'endtoend_suite' => 'root',
464+
'endtoend_config' => '',
465+
'endtoend_tags' => '',
466+
'js' => 'false',
467+
'doclinting' => 'false',
468+
'needs_full_setup' => 'true',
469+
'name' => '8.4 mysql84 phpunit all',
470+
],
471+
[
472+
'installer_version' => '6.x-dev',
473+
'php' => '8.3',
474+
'db' => DB_MYSQL_80,
475+
'composer_require_extra' => '',
476+
'composer_args' => '',
477+
'name_suffix' => '',
478+
'phpunit' => 'false',
479+
'phpunit_suite' => 'all',
480+
'phplinting' => 'false',
481+
'phpcoverage' => 'false',
482+
'endtoend' => 'true',
483+
'endtoend_suite' => 'root',
484+
'endtoend_config' => '',
485+
'endtoend_tags' => '',
486+
'js' => 'false',
487+
'doclinting' => 'false',
488+
'needs_full_setup' => 'true',
489+
'name' => '8.3 mysql80 endtoend root',
490+
],
491+
[
492+
'installer_version' => '6.x-dev',
493+
'php' => '8.4',
494+
'db' => DB_MYSQL_84,
495+
'composer_require_extra' => '',
496+
'composer_args' => '',
497+
'name_suffix' => '',
498+
'phpunit' => 'false',
499+
'phpunit_suite' => 'all',
500+
'phplinting' => 'false',
501+
'phpcoverage' => 'false',
502+
'endtoend' => 'true',
503+
'endtoend_suite' => 'root',
504+
'endtoend_config' => '',
505+
'endtoend_tags' => '',
506+
'js' => 'false',
507+
'doclinting' => 'false',
508+
'needs_full_setup' => 'true',
509+
'name' => '8.4 mysql84 endtoend root',
510+
],
511+
]
512+
],
397513
// behat with @job1/@job2 test
398514
[
399515
implode("\n", [

0 commit comments

Comments
 (0)