automerge flag

Author: tschm

.github/renovate.json

@@ -10,9 +10,9 @@
         "pre-commit",
         "github-actions"
     ],
-    "automerge": true,
-    "automergeType": "pr",
-    "platformAutomerge": true,
+    //   "automerge": true,
+    //   "automergeType": "pr",
+    //   "platformAutomerge": true,
     "timezone": "Asia/Dubai",
     "schedule": [
         "before 10am on tuesday"

README.md

@@ -40,6 +40,7 @@ jobs:
 | branch | Target branch in the current repo | No | sync/update |
 | commit-message | Commit message for sync | No | chore: sync template |
 | test-mode | If true, skip push and PR creation | No | false |
+| automerge | If true, enable auto-merge for the created PR | No | false |
 
 
 ## How It Works
@@ -58,7 +59,7 @@ Pull requests are created using the peter-evans/create-pull-request action, whic
 
 ### Auto-merge
 
-After a PR is created, this action enables auto-merge when a PR number is available (condition: `steps.create-pr.outputs.pull-request-number != ''`). It uses GitHub CLI with:
+After a PR is created, this action enables auto-merge only when you set `with.automerge: 'true'` and a PR number is available (condition: `inputs.automerge == 'true' && steps.create-pr.outputs.pull-request-number != ''`). It uses GitHub CLI with:
 
 ```
 gh pr merge <number> --merge --auto --delete-branch

action.yml

@@ -18,7 +18,10 @@ inputs:
   test-mode:
     description: 'If true, skip push and PR creation'
     default: 'false'
-
+  automerge:
+    description: 'If true, enable auto-merge on the PR'
+    default: 'false'
+    
 runs:
   using: "composite"
   steps:
@@ -168,7 +171,7 @@ runs:
 
     - name: Enable auto-merge
       shell: bash
-      if: ${{ steps.create-pr.outputs.pull-request-number != '' }}
+      if: ${{ inputs.automerge == 'true' && steps.create-pr.outputs.pull-request-number != '' }}
       env:
         GH_TOKEN: ${{ inputs.token }}
       run: |

tests/test-action.sh

@@ -163,4 +163,35 @@ assert "[ \"$(cat LICENSE)\" = \"# Target License\" ]" "LICENSE was not overwrit
 # Check commit message
 assert "[ \"$(git log -1 --pretty=%B)\" = \"chore: sync template\" ]" "Commit message is correct"
 
+# Simulate auto-merge behavior as implemented in action.yml
+# Condition: Enable auto-merge only when automerge input is 'true' AND a PR number is available (non-empty)
+echo -e "${YELLOW}Simulating auto-merge behavior${NC}"
+
+# Positive case: automerge enabled and PR number available triggers auto-merge command
+AUTOMERGE="true"
+PR_NUMBER="123"
+AUTO_MERGE_CMD=""
+if [[ "${AUTOMERGE}" == "true" && "${PR_NUMBER}" != "" ]]; then
+  AUTO_MERGE_CMD="gh pr merge ${PR_NUMBER} --merge --auto --delete-branch"
+fi
+assert "[ \"${AUTO_MERGE_CMD}\" = \"gh pr merge 123 --merge --auto --delete-branch\" ]" "Auto-merge command generated when automerge is true and PR number is set"
+
+# Negative case: automerge disabled means skip even if PR number exists
+AUTOMERGE="false"
+PR_NUMBER="123"
+AUTO_MERGE_EXECUTED="false"
+if [[ "${AUTOMERGE}" == "true" && "${PR_NUMBER}" != "" ]]; then
+  AUTO_MERGE_EXECUTED="true"
+fi
+assert "[ \"${AUTO_MERGE_EXECUTED}\" = \"false\" ]" "Auto-merge is skipped when automerge is false even if PR number is provided"
+
+# Negative case: automerge enabled but no PR number means skip
+AUTOMERGE="true"
+PR_NUMBER=""
+AUTO_MERGE_EXECUTED="false"
+if [[ "${AUTOMERGE}" == "true" && "${PR_NUMBER}" != "" ]]; then
+  AUTO_MERGE_EXECUTED="true"
+fi
+assert "[ \"${AUTO_MERGE_EXECUTED}\" = \"false\" ]" "Auto-merge is skipped when PR number is empty"
+
 echo -e "${GREEN}All tests passed!${NC}"