Skip to content

Commit 5d4c33e

Browse files
committed
Replace the queue to protect the default branch
Also, remove all the rules that are not the queue itself, the rule protecting version branches will be used for the other branch restrcitions. Signed-off-by: Leandro Lucarella <[email protected]>
1 parent 0adfc17 commit 5d4c33e

File tree

3 files changed

+48
-98
lines changed

3 files changed

+48
-98
lines changed

docs/user-guide/start-a-new-project/configure-github.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ Import the following
100100
tags]({{config.repo_url}}/blob/{{ref_name}}/github-rulesets/Protect released tags.json)
101101
* [Protect version
102102
branches]({{config.repo_url}}/blob/{{ref_name}}/github-rulesets/Protect version branches.json)
103-
* [Queue PRs for
104-
v0.x.x]({{config.repo_url}}/blob/{{ref_name}}/github-rulesets/Queue PRs for v0.x.x.json)
103+
* [Queue PRs for the default
104+
branch]({{config.repo_url}}/blob/{{ref_name}}/github-rulesets/Queue PRs for the default branch.json)
105105

106106
### Code security and analysis
107107

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{
2+
"name": "Queue PRs for the default branch",
3+
"target": "branch",
4+
"source_type": "Repository",
5+
"source": "frequenz-floss/frequenz-repo-config-python",
6+
"enforcement": "active",
7+
"conditions": {
8+
"ref_name": {
9+
"exclude": [],
10+
"include": [
11+
"~DEFAULT_BRANCH"
12+
]
13+
}
14+
},
15+
"rules": [
16+
{
17+
"type": "merge_queue",
18+
"parameters": {
19+
"merge_method": "MERGE",
20+
"max_entries_to_build": 5,
21+
"min_entries_to_merge": 1,
22+
"max_entries_to_merge": 5,
23+
"min_entries_to_merge_wait_minutes": 5,
24+
"grouping_strategy": "ALLGREEN",
25+
"check_response_timeout_minutes": 60
26+
}
27+
}
28+
],
29+
"bypass_actors": [
30+
{
31+
"actor_id": 2,
32+
"actor_type": "RepositoryRole",
33+
"bypass_mode": "pull_request"
34+
},
35+
{
36+
"actor_id": 5,
37+
"actor_type": "RepositoryRole",
38+
"bypass_mode": "always"
39+
},
40+
{
41+
"actor_id": 1,
42+
"actor_type": "OrganizationAdmin",
43+
"bypass_mode": "always"
44+
}
45+
]
46+
}

github-rulesets/Queue PRs for v0.x.x.json

Lines changed: 0 additions & 96 deletions
This file was deleted.

0 commit comments

Comments
 (0)