Skip to content

Commit 54a2c6b

Browse files
authored
Fix dependabot YAML parse in auto-merge workflow (#21)
2 parents 171aec3 + 0252af7 commit 54a2c6b

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

.github/release.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,16 @@ changelog:
88
- title: Features
99
labels:
1010
- enhancement
11-
- feature
1211
- title: Bug Fixes
1312
labels:
1413
- bug
15-
- fix
1614
- title: Dependencies
1715
labels:
1816
- dependencies
1917
- title: Internal
2018
labels:
2119
- internal
2220
- refactor
23-
- chore
2421
- tests
2522
- ci
2623
- docs

.github/workflows/dependabot-automerge.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,19 +70,23 @@ jobs:
7070
env:
7171
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7272
PR_URL: ${{ github.event.pull_request.html_url }}
73-
run: gh pr review --approve "$PR_URL" --body "Auto-approved: ${{ steps.decide.outputs.reason }}."
73+
REASON: ${{ steps.decide.outputs.reason }}
74+
run: |
75+
gh pr review --approve "$PR_URL" --body "Auto-approved: $REASON."
7476
7577
- name: Enable auto-merge (squash)
7678
if: steps.decide.outputs.should_merge == 'true'
7779
env:
7880
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7981
PR_URL: ${{ github.event.pull_request.html_url }}
80-
run: gh pr merge --auto --squash "$PR_URL"
82+
run: |
83+
gh pr merge --auto --squash "$PR_URL"
8184
8285
- name: Leave a note for manual review
8386
if: steps.decide.outputs.should_merge != 'true'
8487
env:
8588
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8689
PR_URL: ${{ github.event.pull_request.html_url }}
90+
REASON: ${{ steps.decide.outputs.reason }}
8791
run: |
88-
gh pr comment "$PR_URL" --body "Auto-merge skipped: ${{ steps.decide.outputs.reason }}. Review manually."
92+
gh pr comment "$PR_URL" --body "Auto-merge skipped: $REASON. Review manually."

0 commit comments

Comments
 (0)