Skip to content

Commit

Permalink
Auto merge of #4 - troy/impl, r=TroyKomodo
Browse files Browse the repository at this point in the history
Implement the Brawl Bot
<!--
Thank you for your Pull Request. Please provide a description above and review
the requirements below.

Bug fixes and new features should include tests.

Contributors guide: https://github.com/ScuffleTV/.github/blob/main/CONTRIBUTING.md
-->

## Motivation

<!--
Explain the context and why you're making that change. What is the problem
you're trying to solve? If a new feature is being added, describe the intended
use case that feature fulfills.
-->

## Solution

<!--
Summarize the solution and provide any necessary context needed to understand
the code change.
-->

## Tickets

<!--
Link any relevant tickets. Remember to not specify the ticket ids in the commit messages.
-->
  • Loading branch information
scuffle-brawl[bot] authored Dec 17, 2024
2 parents 92c71dc + aeac1d4 commit e47eccb
Show file tree
Hide file tree
Showing 40 changed files with 5,173 additions and 198 deletions.
42 changes: 8 additions & 34 deletions .github/brawl.toml
Original file line number Diff line number Diff line change
@@ -1,43 +1,17 @@
[queue]
enabled = true

# Target branches that can PRs can be merged into
branches = [
"main",
]

# A branch prefix for `@brawl try` attempts
# Will append the PR number to the end of the prefix:
# `automation/brawl/try/<pr_number>`
# Like: `automation/brawl/try/123`
try_branch_prefix = "automation/brawl/try/"

# A branch prefix for @brawl +r commands
# Will append the target branch name to the end of the prefix:
# `automation/brawl/merge/<target_branch_name>`
# Like: `automation/brawl/merge/main`
merge_branch_prefix = "automation/brawl/merge/"

# By default only users with `write` access can merge PRs
merge_permissions = [
"role:write", # include anyone with write access
# "team:<team_name>", # include members of this team
# "user:<username>", # include this user
"role:write",
]

# By default it will be the same as the merge permissions
# try_permissions = [
# "role:write",
# "team:<team_name>",
# "user:<username>",
# ]

[queue.labels]
on_merge_queued = "waiting-for-brawl-merge"
on_merge_in_progress = "running-brawl-merge"
on_merge_failure = "brawl-merge-failed"
on_merge_success = "merged-by-brawl"
on_try_queued = "waiting-for-brawl-try"
on_try_in_progress = "running-brawl-try"
on_try_failure = "brawl-try-failed"
on_try_success = "brawl-try-success"
[labels]
on_merge_queued = "B-brawl-queued"
on_merge_in_progress = "B-brawl-merging"
on_merge_failure = "B-brawl-failed"
on_merge_success = "B-brawl-merged"
on_try_in_progress = "B-brawl-try"
on_try_failure = "B-brawl-try-failed"
4 changes: 4 additions & 0 deletions .github/workflows/audit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ name: Security audit
on:
push:
branches-ignore:
<<<<<<< HEAD
- 'automation/**'
=======
- 'automation/brawl/temp/*'
>>>>>>> 685dabf (ignore tmp branch)
paths:
- '.github/workflows/audit.yaml'
- '**/Cargo.toml'
Expand Down
Loading

0 comments on commit e47eccb

Please sign in to comment.