Fix AUTO_MERGE var calculation in the spring-merge-dependabot-pr.yml

spring-io · Feb 7, 2025 · 4c101b0 · 4c101b0
1 parent f6486bb
commit 4c101b0
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/.github/workflows/spring-merge-dependabot-pr.yml b/.github/workflows/spring-merge-dependabot-pr.yml
@@ -67,12 +67,17 @@ jobs:
           gh pr edit ${{ github.event.pull_request.number }} --add-label "${{ inputs.developmentLabel }}"
           gh pr edit ${{ github.event.pull_request.number }} --remove-label "${{ inputs.dependenciesLabel }}"
 
-      - id: is-auto-merge
+      - name: Determine auto-merge
+        id: is-auto-merge
         run: |
           AUTO_MERGE=${{ inputs.autoMerge || (inputs.autoMergeSnapshots && endsWith(steps.metadata.outputs.new-version, '-SNAPSHOT')) }}
           if [ -z $AUTO_MERGE ]
           then
-            AUTO_MERGE=$(gh pr view ${{ github.event.pull_request.number }} --json milestone -q '.milestone.number')
+            PR_MILESTONE=$(gh pr view ${{ github.event.pull_request.number }} --json milestone -q '.milestone.number')
+            if [ -z $PR_MILESTONE ]
+            then
+              AUTO_MERGE=true
+            fi
           fi
           echo autoMerge=$AUTO_MERGE >> $GITHUB_OUTPUT