Skip to content

Commit

Permalink
fixed merge bot not working
Browse files Browse the repository at this point in the history
Removed the `environment: master` (because I think it has not been set up) and added the owner value to the token generation.
  • Loading branch information
Bullrich committed Jul 15, 2024
1 parent 8122afa commit 28c5b6e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}
Expand All @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/review-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/up-to-date.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ jobs:
updatePullRequests:
name: Keep PRs up to date
runs-on: ubuntu-latest
environment: master
steps:
- name: Generate token
id: generate_token
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: Update all the PRs
uses: paritytech/up-to-date-action@v0.2.1
with:
Expand Down

0 comments on commit 28c5b6e

Please sign in to comment.