From 28c5b6e6c71acd7b66b9a64250c063fe8029762d Mon Sep 17 00:00:00 2001
From: Javier Bullrich <javier@bullrich.dev>
Date: Mon, 15 Jul 2024 11:53:55 +0200
Subject: [PATCH] fixed merge bot not working

Removed the `environment: master` (because I think it has not been set up) and added the owner value to the token generation.
---
 .github/workflows/auto-merge.yml | 4 ++--
 .github/workflows/review-bot.yml | 3 ++-
 .github/workflows/up-to-date.yml | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index ef1cfb7..373f106 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -8,7 +8,6 @@ on:
 jobs:
   set-auto-merge:
     runs-on: ubuntu-latest
-    environment: master
     timeout-minutes: 10
     # Important! This forces the job to run only on comments on Pull Requests that starts with '/merge'
     if: ${{ github.event.issue.pull_request && startsWith(github.event.comment.body, '/merge') }}
@@ -18,10 +17,11 @@ jobs:
         id: fellows
       - name: Generate a token
         id: merge_token
-        uses: actions/create-github-app-token@v1.8.1
+        uses: actions/create-github-app-token@v1
         with:
           app-id: ${{ secrets.MERGE_APP_ID }}
           private-key: ${{ secrets.MERGE_APP_KEY }}
+          owner: ${{ github.repository_owner }}
       - name: Set auto merge
         uses: paritytech/auto-merge-bot@v1.0.1
         with:
diff --git a/.github/workflows/review-bot.yml b/.github/workflows/review-bot.yml
index 2116308..8a88965 100644
--- a/.github/workflows/review-bot.yml
+++ b/.github/workflows/review-bot.yml
@@ -21,10 +21,11 @@ jobs:
           artifact-name: pr_number
       - name: Generate token
         id: team_token
-        uses: actions/create-github-app-token@v1.9.3
+        uses: actions/create-github-app-token@v1
         with:
           app-id: ${{ secrets.REVIEW_APP_ID }}
           private-key: ${{ secrets.REVIEW_APP_KEY }}
+          owner: ${{ github.repository_owner }}
       - name: "Evaluates PR reviews and assigns reviewers"
         uses: paritytech/review-bot@v2.5.0
         with:
diff --git a/.github/workflows/up-to-date.yml b/.github/workflows/up-to-date.yml
index a660979..271775f 100644
--- a/.github/workflows/up-to-date.yml
+++ b/.github/workflows/up-to-date.yml
@@ -9,7 +9,6 @@ jobs:
   updatePullRequests:
     name: Keep PRs up to date
     runs-on: ubuntu-latest
-    environment: master
     steps:
       - name: Generate token
         id: generate_token
@@ -17,6 +16,7 @@ jobs:
         with:
           app-id: ${{ secrets.MERGE_APP_ID }}
           private-key: ${{ secrets.MERGE_APP_KEY }}
+          owner: ${{ github.repository_owner }}
       - name: Update all the PRs
         uses: paritytech/up-to-date-action@v0.2.1
         with: