Skip to content

Commit e34eb74

Browse files
🔄 synced local '.github/workflows/' with remote 'config/workflows/'
Signed-off-by: nextcloud-android-bot <[email protected]>
1 parent 78fd85a commit e34eb74

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

‎.github/workflows/renovate-approve-merge.yml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ jobs:
2929
permissions:
3030
# for hmarr/auto-approve-action to approve PRs
3131
pull-requests: write
32-
# for alexwilson/enable-github-automerge-action to approve PRs
33-
contents: write
3432

3533
steps:
3634
- name: Disabled on forks
@@ -46,13 +44,18 @@ jobs:
4644

4745
# GitHub actions bot approve
4846
- uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0
49-
if: startsWith(steps.branchname.outputs.branch, 'renovate/')
47+
if: github.actor == 'renovate[bot]'
5048
with:
5149
github-token: ${{ secrets.GITHUB_TOKEN }}
5250

53-
# Enable GitHub auto merge
54-
- name: Auto merge
55-
uses: alexwilson/enable-github-automerge-action@56e3117d1ae1540309dc8f7a9f2825bc3c5f06ff # v2.0.0
56-
if: startsWith(steps.branchname.outputs.branch, 'renovate/')
51+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5752
with:
58-
github-token: ${{ secrets.GITHUB_TOKEN }}
53+
ref: ${{ github.head_ref }}
54+
55+
# Enable GitHub auto merge
56+
- name: Enable Pull Request Automerge
57+
if: github.actor == 'renovate[bot]'
58+
run: gh pr merge --merge --auto
59+
env:
60+
GH_TOKEN: ${{ secrets.AUTOMERGE }}
61+

0 commit comments

Comments
 (0)