Merge branch '1.15' into 1

silverstripe · Aug 27, 2024 · 4b76a96 · 4b76a96
2 parents f796d19 + c96920c
commit 4b76a96
Show file tree

Hide file tree

Showing 2 changed files with 309 additions and 33 deletions.
diff --git a/job_creator.php b/job_creator.php
@@ -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]);
@@ -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'];
     }
 
     /**