From 21448567dd0339def366cda421874ba3a0435219 Mon Sep 17 00:00:00 2001 From: Javier Bullrich Date: Wed, 22 Nov 2023 12:15:37 +0100 Subject: [PATCH] auto-merge: replaced review bot for merge bot (#98) When adapted the code from #88 I forgot to update the location of the credentials, so it was using review-bot which can only enable auto-merge but can not merge a ready to merge PR. Follow up to #97 --- .github/workflows/auto-merge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 66325807b1..32cb12fb49 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -19,8 +19,8 @@ jobs: id: merge_token uses: tibdex/github-app-token@v1 with: - app_id: ${{ secrets.REVIEW_APP_ID }} - private_key: ${{ secrets.REVIEW_APP_KEY }} + app_id: ${{ secrets.MERGE_APP_ID }} + private_key: ${{ secrets.MERGE_APP_KEY }} - name: Set auto merge uses: paritytech/auto-merge-bot@v1.0.0 with: