Merge pull request #44 from creative-commoners/pulls/1.1/misc-array

FIX Make JS update action compatible with node tools

Author: GuySartorelli

action.yml

@@ -121,7 +121,7 @@ runs:
         echo "framework_supported_major=$FRAMEWORK_SUPPORTED_MAJOR" >> "$GITHUB_OUTPUT"
         # Create a module map of { module_major: cms_version }
         # e.g. for silverstripe/admin it will be { "1": "4", "2": "5", "3": "6" }
-        MODULE_MAP=$(jq -r --arg github_repository "$GITHUB_REPOSITORY" '.supportedModules[] | select(.github == $github_repository) | .majorVersionMapping | to_entries | map({key: .value[0], value: .key}) | from_entries' __repositories.json)
+        MODULE_MAP=$(jq -r --arg github_repository "$GITHUB_REPOSITORY" '(.supportedModules + .misc)[] | select(.github == $github_repository) | .majorVersionMapping | to_entries | map({key: .value[0], value: .key}) | from_entries' __repositories.json)
         echo "MODULE_MAP is $MODULE_MAP"
         rm __repositories.json
         # Work out the CMS version that $DEFAULT_BRANCH maps to
@@ -376,7 +376,11 @@ runs:
       if: inputs.branch_type != 'schedule' && steps.derive-module-branch.outputs.proceed == '1'
       shell: bash
       run: |
-        NODE_ENV=production node_modules/.bin/webpack --mode production --bail --progress
+        if [[ -f node_modules/.bin/webpack-cli ]]; then
+          NODE_ENV=production node_modules/.bin/webpack --mode production --bail --progress
+        else
+          echo "webpack-cli is not installed, skipping webpack build"
+        fi
 
     - name: Remove any old pull-requests
       if: inputs.branch_type != 'schedule' && steps.derive-module-branch.outputs.proceed == '1'
@@ -490,8 +494,20 @@ runs:
           rm __pull_requests.json
         fi
 
-    - name: Derive PR branch name
+    - name: Check for changes
+      id: check-changes
       if: inputs.branch_type != 'schedule' && steps.derive-module-branch.outputs.proceed == '1'
+      shell: bash
+      run: |
+        if [[ -z "$(git status --porcelain)" ]]; then
+          echo "No changes detected, skipping pull-request creation"
+          echo "has_changes=0" >> "$GITHUB_OUTPUT"
+        else
+          echo "has_changes=1" >> "$GITHUB_OUTPUT"
+        fi
+
+    - name: Derive PR branch name
+      if: inputs.branch_type != 'schedule' && steps.derive-module-branch.outputs.proceed == '1' && steps.check-changes.outputs.has_changes == '1'
       id: derive-pr-branch-name
       shell: bash
       env:
@@ -502,7 +518,7 @@ runs:
         echo "pr_branch=$PR_BRANCH" >> "$GITHUB_OUTPUT"
 
     - name: Git
-      if: inputs.branch_type != 'schedule' && steps.derive-module-branch.outputs.proceed == '1'
+      if: inputs.branch_type != 'schedule' && steps.derive-module-branch.outputs.proceed == '1' && steps.check-changes.outputs.has_changes == '1'
       uses: silverstripe/gha-pull-request@v1
       with:
         branch: ${{ steps.derive-pr-branch-name.outputs.pr_branch }}