swarm-controller: config repos require the swarm-builder status and default to fast-forward-only merges
This commit is contained in:
parent
70e5de5571
commit
7a7041452e
1 changed files with 212 additions and 14 deletions
|
|
@ -393,8 +393,13 @@ one per hive. It ensures them at start and every five minutes after
|
|||
owner org;
|
||||
- the empty `operators` merge-gate team in `agents` and `agent-configs`;
|
||||
- the `main` merge gate on every `agent-configs` repo: merge and approval
|
||||
whitelists = the `operators` team, and no user. The controller leaves a
|
||||
repo with no `main` rule alone;
|
||||
whitelists = the `operators` team, and no user, and the `swarm-builder`
|
||||
commit status must have passed (it is the only required status). 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 is allowed so an out-of-date PR
|
||||
branch can be brought onto `main`. The other merge styles stay as the
|
||||
repo has them;
|
||||
- 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