From 73f323f93ec535ac9f98b7523f01ef293019032f Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Thu, 23 Apr 2026 13:33:35 +0200 Subject: [PATCH] fix: also auto-approve with bot token Signed-off-by: Ferdinand Thiessen --- workflow-templates/dependabot-approve-merge.yml | 7 +++++++ workflow-templates/renovate-approve-merge.yml | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/workflow-templates/dependabot-approve-merge.yml b/workflow-templates/dependabot-approve-merge.yml index 2371586..b32913c 100644 --- a/workflow-templates/dependabot-approve-merge.yml +++ b/workflow-templates/dependabot-approve-merge.yml @@ -50,6 +50,13 @@ jobs: with: github-token: ${{ secrets.GITHUB_TOKEN }} + # Nextcloud bot approve (for 2-reviews required repositories) + - name: Nextcloud Bot approve + uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0 + if: startsWith(steps.branchname.outputs.branch, 'dependabot/') + with: + github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }} + # Enable GitHub auto merge - name: Auto merge uses: alexwilson/enable-github-automerge-action@56e3117d1ae1540309dc8f7a9f2825bc3c5f06ff # v2.0.0 diff --git a/workflow-templates/renovate-approve-merge.yml b/workflow-templates/renovate-approve-merge.yml index 1ff1fa1..a164974 100644 --- a/workflow-templates/renovate-approve-merge.yml +++ b/workflow-templates/renovate-approve-merge.yml @@ -50,6 +50,13 @@ jobs: with: github-token: ${{ secrets.GITHUB_TOKEN }} + # Nextcloud bot approve (for 2-reviews required repositories) + - name: Nextcloud Bot approve + uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0 + if: startsWith(steps.branchname.outputs.branch, 'renovate/') + with: + github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }} + # Enable GitHub auto merge - name: Auto merge uses: alexwilson/enable-github-automerge-action@56e3117d1ae1540309dc8f7a9f2825bc3c5f06ff # v2.0.0