Skip to content

Commit

Permalink
added update branch before auto-merge (#429)
Browse files Browse the repository at this point in the history
Updated `auto-merge-bot` to version
[`1.1.0`](https://github.com/paritytech/auto-merge-bot/releases/tag/v1.1.0)
which has the option to update a branch to be up-to-date before merging.

- [x] Does not require a CHANGELOG entry
  • Loading branch information
Bullrich authored Aug 13, 2024
1 parent b2ae4df commit 9cfa42c
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ jobs:
app-id: ${{ secrets.MERGE_APP_ID }}
private-key: ${{ secrets.MERGE_APP_KEY }}
- name: Set auto merge
uses: paritytech/auto-merge-bot@v1.0.1
uses: paritytech/auto-merge-bot@v1.1.0
with:
GITHUB_TOKEN: ${{ steps.merge_token.outputs.token }}
MERGE_METHOD: "SQUASH"
ALLOWLIST: ${{ steps.fellows.outputs.github-handles }}
UPDATE_BEFORE_MERGE: true

0 comments on commit 9cfa42c

Please sign in to comment.