Merge pull request #33 from creative-commoners/pulls/1.0/linkfield3

FIX Handle linkfield 3.0 branch
silverstripe · Apr 9, 2024 · 5e6fcd9 · 5e6fcd9
2 parents 04b8661 + e254a45
commit 5e6fcd9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/funcs.php b/funcs.php
@@ -164,7 +164,7 @@ function branches(
     if (isset(DO_NOT_MERGE_UP_FROM_MAJOR[$githubRepository])) {
         $doNotMergeUpFromMajor = DO_NOT_MERGE_UP_FROM_MAJOR[$githubRepository];
         $branches = array_filter($branches, function($branch) use ($doNotMergeUpFromMajor) {
-            return version_compare($branch, $doNotMergeUpFromMajor, '>');
+            return version_compare($branch, "$doNotMergeUpFromMajor.999999.999999", '>');
         });
     }
 

diff --git a/tests/BranchesTest.php b/tests/BranchesTest.php
@@ -452,6 +452,9 @@ public function provideBranches()
                     {"name": "1"},
                     {"name": "2"},
                     {"name": "3"},
+                    {"name": "3.0"},
+                    {"name": "3.1"},
+                    {"name": "3.999"},
                     {"name": "4"},
                     {"name": "4.0"},
                     {"name": "5"}