Skip to content

Commit

Permalink
FIX Ensure silverstripe/config CI uses correct PHP versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@GuySartorelli
GuySartorelli committed Aug 27, 2024
1 parent 8602ea0 commit 487b0e7
Show file tree
Hide file tree
Showing 2 changed files with 300 additions and 2 deletions.
5 changes: 3 additions & 2 deletions job_creator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ private function isAllowedPhpVersion(string $phpVersion)
private function getInstallerBranch(): string
{
$version = str_replace('.x-dev', '', $this->installerVersion);
if (!in_array($this->repoName, FORCE_INSTALLER_REPOS) && isset($this->repoData['type']) && $this->repoData['type'] === 'recipe') {
if (in_array($this->repoName, NO_INSTALLER_REPOS) || (!in_array($this->repoName, FORCE_INSTALLER_REPOS) && isset($this->repoData['type']) && $this->repoData['type'] === 'recipe')) {
$cmsMajor = BranchLogic::getCmsMajor($this->repoData, $this->branch, $this->getComposerJsonContent()) ?: MetaData::LOWEST_SUPPORTED_CMS_MAJOR;
if (preg_match('#^[1-9]\.([0-9]+)$#', $this->branch, $matches)) {
$version = sprintf('%d.%d', $cmsMajor, $matches[1]);
Expand Down Expand Up @@ -346,7 +346,8 @@ private function createPhpunitJobs(
*/
private function getListOfPhpVersionsByBranchName(): array
{
return MetaData::PHP_VERSIONS_FOR_CMS_RELEASES[$this->getInstallerBranch()] ?? MetaData::PHP_VERSIONS_FOR_CMS_RELEASES['4'];
$branch = $this->getInstallerBranch();
return MetaData::PHP_VERSIONS_FOR_CMS_RELEASES[$branch] ?? MetaData::PHP_VERSIONS_FOR_CMS_RELEASES['4'];
}

/**
Expand Down
297 changes: 297 additions & 0 deletions tests/JobCreatorTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -931,6 +931,303 @@ public function provideCreateJson(): array
];
}

/**
* silverstripe/config is a bit of a special case, so test for it explicitly
* @dataProvider provideCreateJsonForConfig
*/
public function testCreateJsonForConfig(string $branch, string $phpConstraint, array $expected): void
{
if (!function_exists('yaml_parse')) {
$this->markTestSkipped('yaml extension is not installed');
}
$yml = <<<EOT
endtoend: false
js: false
phpcoverage: false
phpcoverage_force_off: false
phplinting: true
phpunit: true
doclinting: false
simple_matrix: false
composer_install: false
github_repository: 'silverstripe/silverstripe-config'
github_my_ref: '$branch'
EOT;
try {
$creator = new JobCreator();
$creator->composerJsonPath = '__composer.json';
$composer = <<<COMPOSER
{
"name": "silverstripe/framework",
"require": {
"php": "$phpConstraint"
}
}
COMPOSER;
$expectedPhps = ['8.3', '8.3', '8.3', '8.3'];
file_put_contents('__composer.json', $composer);
$json = json_decode($creator->createJson($yml));
$this->assertSame(count($expected), count($json->include));
for ($i = 0; $i < count($expected); $i++) {
foreach ($expected[$i] as $key => $expectedVal) {
$this->assertSame($expectedVal, $json->include[$i]->$key, "\$i is $i, \$key is $key");
}
}
} finally {
unlink('__composer.json');
}
}

public function provideCreateJsonForConfig(): array
{
return [
'cms 4' => [
'branch' => '1.6',
'phpConstraint' => '^7.4 || ^8.0',
'expected' => [
[
'installer_version' => '',
'php' => '7.4',
'db' => DB_MYSQL_57,
'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' => 'false',
'name' => '7.4 prf-low mysql57 phpunit all',
],
[
'installer_version' => '',
'php' => '8.0',
'db' => DB_MYSQL_57_PDO,
'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' => 'false',
'name' => '8.0 mysql57pdo phpunit all',
],
[
'installer_version' => '',
'php' => '8.1',
'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' => 'false',
'name' => '8.1 mysql80 phpunit all',
],
],
],
'cms 5.1+' => [
'branch' => '2.1',
'phpConstraint' => '^8.1',
'expected' => [
[
'installer_version' => '',
'php' => '8.1',
'db' => DB_MYSQL_57,
'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' => 'false',
'name' => '8.1 prf-low mysql57 phpunit all',
],
[
'installer_version' => '',
'php' => '8.1',
'db' => DB_MARIADB,
'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' => 'false',
'name' => '8.1 mariadb phpunit all',
],
[
'installer_version' => '',
'php' => '8.2',
'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' => 'false',
'name' => '8.2 mysql80 phpunit all',
],
],
],
'cms 5.x' => [
'branch' => '2',
'phpConstraint' => '^8.1',
'expected' => [
[
'installer_version' => '',
'php' => '8.1',
'db' => DB_MYSQL_57,
'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' => 'false',
'name' => '8.1 prf-low mysql57 phpunit all',
],
[
'installer_version' => '',
'php' => '8.2',
'db' => DB_MARIADB,
'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' => 'false',
'name' => '8.2 mariadb phpunit all',
],
[
'installer_version' => '',
'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' => 'false',
'name' => '8.3 mysql80 phpunit all',
],
],
],
'cms 6.x' => [
'branch' => '3',
'phpConstraint' => '^8.3',
'expected' => [
[
'installer_version' => '',
'php' => '8.3',
'db' => DB_MYSQL_57,
'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' => 'false',
'name' => '8.3 prf-low mysql57 phpunit all',
],
[
'installer_version' => '',
'php' => '8.3',
'db' => DB_MARIADB,
'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' => 'false',
'name' => '8.3 mariadb phpunit all',
],
],
],
];
}

/**
* @dataProvider provideParentBranch
*/
Expand Down

0 comments on commit 487b0e7

Please sign in to comment.