Skip to content

Commit 4c101b0

Browse files
committed
Fix AUTO_MERGE var calculation in the spring-merge-dependabot-pr.yml
1 parent f6486bb commit 4c101b0

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

.github/workflows/spring-merge-dependabot-pr.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,17 @@ jobs:
6767
gh pr edit ${{ github.event.pull_request.number }} --add-label "${{ inputs.developmentLabel }}"
6868
gh pr edit ${{ github.event.pull_request.number }} --remove-label "${{ inputs.dependenciesLabel }}"
6969
70-
- id: is-auto-merge
70+
- name: Determine auto-merge
71+
id: is-auto-merge
7172
run: |
7273
AUTO_MERGE=${{ inputs.autoMerge || (inputs.autoMergeSnapshots && endsWith(steps.metadata.outputs.new-version, '-SNAPSHOT')) }}
7374
if [ -z $AUTO_MERGE ]
7475
then
75-
AUTO_MERGE=$(gh pr view ${{ github.event.pull_request.number }} --json milestone -q '.milestone.number')
76+
PR_MILESTONE=$(gh pr view ${{ github.event.pull_request.number }} --json milestone -q '.milestone.number')
77+
if [ -z $PR_MILESTONE ]
78+
then
79+
AUTO_MERGE=true
80+
fi
7681
fi
7782
echo autoMerge=$AUTO_MERGE >> $GITHUB_OUTPUT
7883

0 commit comments

Comments
 (0)