From 439912754bc3984cab71cc3f232e4a0c4f7f708f Mon Sep 17 00:00:00 2001 From: nextcloud-android-bot Date: Fri, 27 Jun 2025 08:18:05 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=84=20synced=20local=20'.github/workfl?= =?UTF-8?q?ows/'=20with=20remote=20'config/workflows/'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nextcloud-android-bot --- .github/workflows/renovate-approve-merge.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/renovate-approve-merge.yml b/.github/workflows/renovate-approve-merge.yml index ccfed3974..b932afe72 100644 --- a/.github/workflows/renovate-approve-merge.yml +++ b/.github/workflows/renovate-approve-merge.yml @@ -29,8 +29,6 @@ jobs: permissions: # for hmarr/auto-approve-action to approve PRs pull-requests: write - # for alexwilson/enable-github-automerge-action to approve PRs - contents: write steps: - name: Disabled on forks @@ -46,13 +44,18 @@ jobs: # GitHub actions bot approve - uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0 - if: startsWith(steps.branchname.outputs.branch, 'renovate/') + if: github.actor == 'renovate[bot]' with: github-token: ${{ secrets.GITHUB_TOKEN }} - # Enable GitHub auto merge - - name: Auto merge - uses: alexwilson/enable-github-automerge-action@56e3117d1ae1540309dc8f7a9f2825bc3c5f06ff # v2.0.0 - if: startsWith(steps.branchname.outputs.branch, 'renovate/') + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: - github-token: ${{ secrets.GITHUB_TOKEN }} + ref: ${{ github.head_ref }} + + # Enable GitHub auto merge + - name: Enable Pull Request Automerge + if: github.actor == 'renovate[bot]' + run: gh pr merge --merge --auto + env: + GH_TOKEN: ${{ secrets.AUTOMERGE }} +