Merge pull request #80 from creative-commoners/pulls/1.12/behat-serve

FIX Use installer for silverstripe/serve and silverstripe/behat-exten…
silverstripe · Jan 31, 2024 · f166409 · f166409
2 parents d2fb178 + d200dc4
commit f166409
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/consts.php b/consts.php
@@ -102,6 +102,12 @@
     'silverstripe-config',
 ];
 
+// Repositories that either don't have a composer type or have a weird composer type, though we still want installer
+const FORCE_INSTALLER_UNLOCKEDSTEPPED_REPOS = [
+    'silverstripe-behat-extension',
+    'silverstripe-serve',
+];
+
 const CMS_TO_REPO_MAJOR_VERSIONS = [
     '4' => [
         'recipe-authoring-tools' => '1',

diff --git a/job_creator.php b/job_creator.php
@@ -68,7 +68,9 @@ public function getInstallerVersion(): string
                 'silverstripe-recipe',
                 'silverstripe-theme',
             ];
-            if (!isset($json->type) || !in_array($json->type, $silverstripeRepoTypes)) {
+            if ((!isset($json->type) || !in_array($json->type, $silverstripeRepoTypes)
+                && !in_array($this->repoName, FORCE_INSTALLER_UNLOCKEDSTEPPED_REPOS)
+            )) {
                 return '';
             }
             // has a lockstepped .x-dev requirement in composer.json

diff --git a/tests/JobCreatorTest.php b/tests/JobCreatorTest.php
@@ -146,6 +146,9 @@ public function provideGetInstallerVersion(): array
             ['myaccount/silverstripe-html5', '2.3', '4.10.x-dev'],
             ['myaccount/silverstripe-html5', '2.4', '4.11.x-dev'],
             ['myaccount/silverstripe-html5', 'burger', $currentMinor],
+            // force installer unlockedstepped repo
+            ['myaccount/silverstripe-serve', '2', $nextMinor],
+            ['myaccount/silverstripe-behat-extension', '2', $nextMinor],
         ];
     }