feat(automerge): simplify command logic

Co-authored-by: Sören Mothes <[email protected]>
Staffbase · Feb 2, 2024 · afcfdec · afcfdec
1 parent 8cc264e
commit afcfdec
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/.github/workflows/template_automerge_dependabot.yml b/.github/workflows/template_automerge_dependabot.yml
@@ -50,12 +50,14 @@ jobs:
 
           MERGE_COMMAND="gh pr merge \"$PR_URL\""
 
-          if [ "${{ inputs.force }}" == 'true' ] && [ "${{ inputs.rebase }}" == 'true' ]; then
-            MERGE_COMMAND+=" --rebase --admin"
-          elif [ "${{ inputs.force }}" == 'true' ]; then
-            MERGE_COMMAND+=" --squash --admin"
-          elif [ "${{ inputs.rebase }}" == 'true' ]; then
+          if [ "${{ inputs.rebase }}" == 'true' ]; then
             MERGE_COMMAND+=" --rebase"
+          else
+            MERGE_COMMAND+=" --squash"
+          fi
+          if [ ${{ inputs.force }} == 'true' ]; then
+            MERGE_COMMAND+=" --admin"
+          fi  
           else
             MERGE_COMMAND+=" --auto --merge"
           fi