Skip to content

Commit 9a64b98

Browse files
committed
ci: fix dependabot auto-merge for grouped updates
1 parent 1f11b1e commit 9a64b98

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

.github/workflows/auto-merge.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,23 @@ jobs:
1919

2020
- name: Approve PR
2121
if: >-
22-
(contains(steps.metadata.outputs.update-type, 'version-update:semver-minor') ||
22+
((contains(steps.metadata.outputs.update-type, 'version-update:semver-minor') ||
2323
contains(steps.metadata.outputs.update-type, 'version-update:semver-patch')) &&
24-
!contains(steps.metadata.outputs.update-type, 'version-update:semver-major')
24+
!contains(steps.metadata.outputs.update-type, 'version-update:semver-major')) ||
25+
(steps.metadata.outputs.dependency-group != '' &&
26+
!contains(steps.metadata.outputs.update-type, 'version-update:semver-major'))
2527
run: gh pr review --approve "$PR_URL"
2628
env:
2729
PR_URL: ${{ github.event.pull_request.html_url }}
2830
GH_TOKEN: ${{ secrets.DEPENDABOT_TOKEN }}
2931

3032
- name: Enable auto-merge for minor and patch updates
3133
if: >-
32-
(contains(steps.metadata.outputs.update-type, 'version-update:semver-minor') ||
34+
((contains(steps.metadata.outputs.update-type, 'version-update:semver-minor') ||
3335
contains(steps.metadata.outputs.update-type, 'version-update:semver-patch')) &&
34-
!contains(steps.metadata.outputs.update-type, 'version-update:semver-major')
36+
!contains(steps.metadata.outputs.update-type, 'version-update:semver-major')) ||
37+
(steps.metadata.outputs.dependency-group != '' &&
38+
!contains(steps.metadata.outputs.update-type, 'version-update:semver-major'))
3539
run: gh pr merge --auto --squash "$PR_URL"
3640
env:
3741
PR_URL: ${{ github.event.pull_request.html_url }}

0 commit comments

Comments
 (0)