docs: the swarm-builder status gates the merge now, and no promise about rebasing a PR branch
This commit is contained in:
parent
2ea8c9de60
commit
5814f177c8
1 changed files with 9 additions and 7 deletions
|
|
@ -397,9 +397,9 @@ one per hive. It ensures them at start and every five minutes after
|
|||
commit status has to pass before a merge, and no other status is
|
||||
required. The controller leaves a repo with no `main` rule alone;
|
||||
- the merge settings of every `agent-configs` repo: fast-forward-only is
|
||||
the default merge style, and rebase stays on, so an operator can rebase
|
||||
an out-of-date PR branch onto `main`. The other merge styles stay as the
|
||||
repo has them;
|
||||
the default merge style, and the rebase merge style stays allowed. The
|
||||
other merge styles stay as the repo has them, and the rule's blocking of
|
||||
out-of-date branches stays as it was;
|
||||
- the pull-mirrors from `deploy.forgejo.mirrors` on the controller's
|
||||
host (with the `actions/checkout` and `actions/upload-artifact` ones
|
||||
`deploy.forgejo.actionsFromSelf` adds, and `hyperhive/hyperhive` from
|
||||
|
|
|
|||
Loading…
Reference in a new issue