Skip to content

Commit

Permalink
CI: Fix automerge action
Browse files Browse the repository at this point in the history
- Add version, which is required by Github.
- Increase number of retries and sleep time between them to cover how
long it takes to run our test suite.
- Make the workflow fail on error.
  • Loading branch information
ccordoba12 committed Sep 28, 2024
1 parent 4af13c2 commit 897eb45
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,13 @@ jobs:
steps:
- id: automerge
name: Automerge
uses: "pascalgn/automerge-action"
uses: "pascalgn/automerge-action@v0.16.4"
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
MERGE_LABELS: "automerge"
MERGE_REMOVE_LABELS: "automerge"
MERGE_METHOD: "squash"
BASE_BRANCHES: "6.x"
MERGE_RETRIES: "12"
MERGE_RETRY_SLEEP: "300000"
MERGE_ERROR_FAIL: "true"

0 comments on commit 897eb45

Please sign in to comment.