Skip to content

Commit 7437013

Browse files
committed
Fix spring-merge-dependabot-pr.yml for autoMergeSnapshots logic
The side effect is caused that even if an update is not a `SNAPSHOT`, and `autoMergeSnapshots == true`, then PR is going to be merged without setting Milestone. * Fix the logic introducing intermediate step to calculate `autoMerge` state. * Introduce a new `autoMerge` input for this workflow to really enable merging without setting the Milestone independently of the upgrade version status
1 parent 91ed38b commit 7437013

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ on:
1818
default: 'type: dependency-upgrade'
1919
required: false
2020
type: string
21+
autoMerge:
22+
description: 'Merged automatically without setting Milestone to the pull request'
23+
default: false
24+
required: false
25+
type: boolean
2126
autoMergeSnapshots:
2227
description: 'Whether upgrades to SNAPSHOTs (usually after release against Milestone) are going to be merged automatically'
2328
default: false
@@ -62,13 +67,18 @@ jobs:
6267
gh pr edit ${{ github.event.pull_request.number }} --add-label "${{ inputs.developmentLabel }}"
6368
gh pr edit ${{ github.event.pull_request.number }} --remove-label "${{ inputs.dependenciesLabel }}"
6469
70+
- id: is-auto-merge
71+
run: |
72+
AUTO_MERGE=${{ inputs.autoMerge || (inputs.autoMergeSnapshots && endsWith(steps.metadata.outputs.new-version, '-SNAPSHOT')) }}
73+
echo autoMerge=$AUTO_MERGE >> $GITHUB_OUTPUT
74+
6575
- name: Find Scheduled Milestone
6676
id: find-milestone
67-
if: ${{ inputs.autoMergeSnapshots != 'true' || !endsWith(steps.metadata.outputs.new-version, '-SNAPSHOT') }}
77+
if: ${{ !steps.is-auto-merge.outputs.autoMerge }}
6878
uses: ./spring-github-workflows/.github/actions/spring-scheduled-milestone-for-branch
6979

7080
- name: Set Milestone to Dependabot pull request
71-
if: ${{ inputs.autoMergeSnapshots != 'true' || !endsWith(steps.metadata.outputs.new-version, '-SNAPSHOT') }}
81+
if: ${{ !steps.is-auto-merge.outputs.autoMerge }}
7282
run: |
7383
MILESTONE=${{ steps.find-milestone.outputs.milestone }}
7484

0 commit comments

Comments
 (0)