Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated auto-merge-bot to 1.0.1 #220

Merged
Merged
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
7836dfe
updated auto-merge-bot to 1.0.1
Bullrich Mar 6, 2024
cb8f9bc
Merge branch 'main' into auto-merge-bot/1.0.1
fellowship-merge-bot[bot] Mar 8, 2024
389e0d8
Merge branch 'main' into auto-merge-bot/1.0.1
fellowship-merge-bot[bot] Mar 8, 2024
9635ffb
Merge branch 'main' into auto-merge-bot/1.0.1
Bullrich Mar 8, 2024
43a2d50
Merge branch 'main' into auto-merge-bot/1.0.1
fellowship-merge-bot[bot] Mar 9, 2024
5a6ff1f
Merge branch 'main' into auto-merge-bot/1.0.1
fellowship-merge-bot[bot] Mar 10, 2024
9971fe5
Merge branch 'main' into auto-merge-bot/1.0.1
fellowship-merge-bot[bot] Mar 11, 2024
d9bdb0a
Merge branch 'main' into auto-merge-bot/1.0.1
fellowship-merge-bot[bot] Mar 12, 2024
5284b4c
Merge branch 'main' into auto-merge-bot/1.0.1
fellowship-merge-bot[bot] Mar 13, 2024
31b578b
Merge branch 'main' into auto-merge-bot/1.0.1
Bullrich Mar 13, 2024
0ca3204
Merge branch 'main' into auto-merge-bot/1.0.1
fellowship-merge-bot[bot] Mar 15, 2024
d94fe58
Merge branch 'main' into auto-merge-bot/1.0.1
fellowship-merge-bot[bot] Mar 15, 2024
f16eba5
Merge branch 'main' into auto-merge-bot/1.0.1
fellowship-merge-bot[bot] Mar 15, 2024
d055984
Merge branch 'main' into auto-merge-bot/1.0.1
fellowship-merge-bot[bot] Mar 15, 2024
0a33a86
Merge branch 'main' into auto-merge-bot/1.0.1
fellowship-merge-bot[bot] Mar 17, 2024
a388a8f
Merge branch 'main' into auto-merge-bot/1.0.1
Bullrich Mar 18, 2024
9e8f05a
updated get-fellows-action to version 1.1.0
Bullrich Mar 18, 2024
175de3d
replaced token generation script for github's
Bullrich Mar 18, 2024
c483263
Merge branch 'main' into auto-merge-bot/1.0.1
fellowship-merge-bot[bot] Mar 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,21 @@ 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') }}
steps:
- name: Get the GitHub handle of the fellows
uses: paritytech/get-fellows-action@v1.0.0
uses: paritytech/get-fellows-action@v1.1.0
id: fellows
- name: Generate token
- name: Generate a token
id: merge_token
uses: tibdex/github-app-token@v1
uses: actions/create-github-app-token@v1.8.1
with:
app_id: ${{ secrets.MERGE_APP_ID }}
private_key: ${{ secrets.MERGE_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
uses: paritytech/auto-merge-bot@v1.0.1
with:
GITHUB_TOKEN: ${{ steps.merge_token.outputs.token }}
MERGE_METHOD: "SQUASH"
Expand Down
Loading