Merge branch '1.2' into 1

silverstripe · May 23, 2024 · b431877 · b431877
2 parents 41aacc7 + dfb7782
commit b431877
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/action.yml b/action.yml
@@ -239,10 +239,10 @@ runs:
           git pull
 
           # Determine if we will rebuild dist file during merge-up
-          # This is based simply on if there are changes in the client/ directory
+          # This is based simply on if there are changes in the client/ directory and if there's a package.json file
           REBUILD=0
           CLIENT_DIFF_FILES=$(git diff --name-only $INTO_BRANCH...$FROM_BRANCH | grep -P ^client/) || true
-          if [[ $CLIENT_DIFF_FILES != "" ]]; then
+          if [[ $CLIENT_DIFF_FILES != "" && -f "package.json" ]]; then
             REBUILD=1
           fi
           echo "CLIENT_DIFF_FILES is:"

diff --git a/funcs.php b/funcs.php
@@ -32,7 +32,8 @@ function branches(
     $branches = BranchLogic::getBranchesForMergeUp($githubRepository, $repoMetaData, $defaultBranch, $allRepoTags, $allRepoBranches, $composerJson);
     // max of 6 branches - also update action.yml if you need to increase this limit
     if (count($branches) > 6) {
-        throw new Exception('More than 6 branches to merge up. Aborting.');
+        $branchesString = implode(', ', $branches);
+        throw new Exception("More than 6 branches to merge up: $branchesString. Aborting.");
     }
     return $branches;
 }