mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-31 03:52:31 +00:00
50babecba3
## About The Pull Request Here introduces "project" branches. Branches designed for bit by bit contributions of large scale refactors and changes. PRs to these branches will show up on tracker like normal but won't apply to master until the project branch itself is done and merged in. This allows for much easier review and atomization without compromising master with temporary hacky code. A maintainer will create a project branch on the repository, allowing any contributor to PR to it like normal. Very simple. An example of this use can be seen in the basic bots PR. It is too large to be full sent as one PR, but doing it one bot at a time will result in a lot of bugs and copy and pasted code. This way, we can update bots one by one until they're all done, then full send it. This PR adjusts our CI (as well as merge conflict checks and 515 compatibility) to run on "`project/`" branches in addition to master.
16 lines
379 B
YAML
16 lines
379 B
YAML
name: 'Check for merge conflicts'
|
|
on:
|
|
push:
|
|
branches:
|
|
- master
|
|
- 'project/**'
|
|
jobs:
|
|
triage:
|
|
runs-on: ubuntu-20.04
|
|
steps:
|
|
- uses: mschilde/auto-label-merge-conflicts@2e8fcc76c6430272ec8bb64fb74ec1592156aa6a
|
|
with:
|
|
CONFLICT_LABEL_NAME: 'Merge Conflict'
|
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
WAIT_MS: 10000
|