e9cb98c83a
The way we have been doing releases does not coincide well with how we have been utilizing our stable branch. Given that we release from master, and that many people in the community use master on a daily basis, it makes more sense for stable to always match the latest released version, and for master to include unreleased changes which are considered "stable". For experiments, we should instead use a feature branch per experiment until we are confident that it is ready to be merged into master.
44 lines
1.4 KiB
YAML
44 lines
1.4 KiB
YAML
pull_request_rules:
|
|
- name: automatic squash-merge for master when CI passes and approved
|
|
conditions:
|
|
- "#approved-reviews-by>=1"
|
|
- and:
|
|
# Unfortunately, we cannot just say "all CI must pass".
|
|
# This is not a bot limitation, but a limitation in Github itself.
|
|
- check-success=all-tests
|
|
- check-success=docker
|
|
- check-success=SonarCloud Code Analysis
|
|
- base=master
|
|
actions:
|
|
queue:
|
|
name: default
|
|
method: squash
|
|
rebase_fallback: none
|
|
update_method: rebase
|
|
- name: automatic merge for stable when CI passes and approved
|
|
conditions:
|
|
- "#approved-reviews-by>=1"
|
|
- and:
|
|
# Unfortunately, we cannot just say "all CI must pass".
|
|
# This is not a bot limitation, but a limitation in Github itself.
|
|
- check-success=all-tests
|
|
- check-success=docker
|
|
- check-success=SonarCloud Code Analysis
|
|
- base=stable
|
|
actions:
|
|
queue:
|
|
name: default
|
|
method: rebase
|
|
rebase_fallback: merge
|
|
update_method: rebase
|
|
|
|
queue_rules:
|
|
- name: default
|
|
conditions:
|
|
- and:
|
|
# Unfortunately, we cannot just say "all CI must pass".
|
|
# This is not a bot limitation, but a limitation in Github itself.
|
|
- check-success=all-tests
|
|
- check-success=docker
|
|
- check-success=SonarCloud Code Analysis
|