Skip to content

Commit 0a88cfe

Browse files
committed
ci: use auto-merge wrapper
1 parent 273888d commit 0a88cfe

File tree

2 files changed

+7
-49
lines changed

2 files changed

+7
-49
lines changed

.github/workflows/auto-merge-on-demand.yml

+3-27
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Auto Merge On Demand
1+
name: Auto Merge Scheduled / On Demand
22
on:
33
schedule:
44
# Workflow runs every 45 minutes
@@ -64,32 +64,8 @@ jobs:
6464
pull-requests: write
6565

6666
steps:
67-
- id: metadata
68-
name: Gather Pull Request Metadata
69-
uses: redhat-plumbers-in-action/gather-pull-request-metadata@v1
67+
- name: Auto Merge wrapper
68+
uses: sclorg/auto-merge-wrapper@v1
7069
with:
7170
pr-number: ${{ matrix.pr-number }}
72-
73-
- id: pull-request-validator
74-
name: Pull Request Validator
75-
uses: redhat-plumbers-in-action/pull-request-validator@v2
76-
with:
77-
pr-metadata: ${{ steps.metadata.outputs.metadata }}
7871
token: ${{ secrets.GITHUB_TOKEN }}
79-
80-
- id: auto-merge
81-
name: Auto Merge
82-
uses: redhat-plumbers-in-action/auto-merge@v2
83-
with:
84-
pr-metadata: ${{ steps.metadata.outputs.metadata }}
85-
token: ${{ secrets.GITHUB_TOKEN }}
86-
87-
- if: ${{ !cancelled() }}
88-
name: Show results in PR comment
89-
uses: redhat-plumbers-in-action/issue-commentator@v1
90-
with:
91-
issue: ${{ fromJSON(steps.metadata.outputs.metadata).number }}
92-
message: |
93-
${{ steps.pull-request-validator.outputs.status && steps.pull-request-validator.outputs.status || '' }}
94-
${{ steps.auto-merge.outputs.status && steps.auto-merge.outputs.status || '' }}
95-
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/auto-merge.yml

+4-22
Original file line numberDiff line numberDiff line change
@@ -30,32 +30,14 @@ jobs:
3030
runs-on: ubuntu-latest
3131

3232
permissions:
33-
# required for ability to merge Pull Request
33+
# required for merging PRs
3434
contents: write
35-
# required for setting labels
35+
# required for PR comments and setting labels
3636
pull-requests: write
3737

3838
steps:
39-
- id: pull-request-validator
40-
name: Pull Request Validator
41-
uses: redhat-plumbers-in-action/pull-request-validator@v2
39+
- name: Auto Merge wrapper
40+
uses: sclorg/auto-merge-wrapper@v1
4241
with:
4342
pr-metadata: ${{ needs.download-metadata.outputs.pr-metadata }}
4443
token: ${{ secrets.GITHUB_TOKEN }}
45-
46-
- id: auto-merge
47-
name: Auto Merge
48-
uses: redhat-plumbers-in-action/auto-merge@v2
49-
with:
50-
pr-metadata: ${{ needs.download-metadata.outputs.pr-metadata }}
51-
token: ${{ secrets.GITHUB_TOKEN }}
52-
53-
- if: ${{ !cancelled() }}
54-
name: Show results in PR comment
55-
uses: redhat-plumbers-in-action/issue-commentator@v1
56-
with:
57-
issue: ${{ fromJSON(needs.download-metadata.outputs.pr-metadata).number }}
58-
message: |
59-
${{ steps.pull-request-validator.outputs.status && steps.pull-request-validator.outputs.status || '' }}
60-
${{ steps.auto-merge.outputs.status && steps.auto-merge.outputs.status || '' }}
61-
token: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)