alamb commented on code in PR #26293:
URL: https://github.com/apache/datafusion/pull/26293#discussion_r4271819705
##########
.asf.yaml:
##########
@@ -112,6 +112,49 @@ github:
branch-55:
required_pull_request_reviews:
required_approving_review_count: 1
+ # GitHub merge queue settings for `main`.
+ #
+ # The merge queue itself was originally enabled by ASF Infra in classic
+ # branch protection (INFRA-27154), which .asf.yaml can not express. Rulesets
+ # can, and .asf.yaml passes raw Rulesets API payloads through unchanged, so
+ # the queue parameters are managed here. See
+ # https://github.com/apache/infrastructure-asfyaml#rulesets
+ #
+ # Merge queue rules do not support wildcard ref patterns, so only the default
+ # branch is covered; release branches keep plain branch protection above.
+ rulesets:
Review Comment:
Here are Comet's settings
https://github.com/apache/datafusion-comet/blob/7d8d9b1544b734c85a93cca2cc9d5380ad70accd/.asf.yaml#L128-L176
```yaml
rulesets:
- name: Merge Queue
target: branch
enforcement: active
bypass_actors:
# apache/root - ASF Infra, so a wedged queue can always be recovered.
- actor_id: 118420
actor_type: Team
bypass_mode: always
conditions:
ref_name:
include:
- "~DEFAULT_BRANCH"
exclude: []
rules:
- type: merge_queue
parameters:
merge_method: SQUASH
grouping_strategy: ALLGREEN
max_entries_to_build: 4
min_entries_to_merge: 1
min_entries_to_merge_wait_minutes: 0
max_entries_to_merge: 5
check_response_timeout_minutes: 300
```
##########
.asf.yaml:
##########
@@ -112,6 +112,49 @@ github:
branch-55:
required_pull_request_reviews:
required_approving_review_count: 1
+ # GitHub merge queue settings for `main`.
+ #
+ # The merge queue itself was originally enabled by ASF Infra in classic
+ # branch protection (INFRA-27154), which .asf.yaml can not express. Rulesets
+ # can, and .asf.yaml passes raw Rulesets API payloads through unchanged, so
+ # the queue parameters are managed here. See
+ # https://github.com/apache/infrastructure-asfyaml#rulesets
+ #
+ # Merge queue rules do not support wildcard ref patterns, so only the default
+ # branch is covered; release branches keep plain branch protection above.
+ rulesets:
Review Comment:
Here are the current settings
```
(venv) andrewlamb@Andrews-MacBook-Pro-3:~/Software/datafusion$ gh api
graphql -f query='{ repository(owner:"apache", name:"datafusion") {
mergeQueue(branch:"main") { configuration {
checkResponseTimeout maximumEntriesToBuild maximumEntriesToMerge
minimumEntriesToMerge minimumEntriesToMergeWaitTime mergeMethod
mergingStrategy } } } }'
{
"data": {
"repository": {
"mergeQueue": {
"configuration": {
"checkResponseTimeout": 3600,
"maximumEntriesToBuild": 5,
"maximumEntriesToMerge": 1,
"minimumEntriesToMerge": 1,
"minimumEntriesToMergeWaitTime": 300,
"mergeMethod": "SQUASH",
"mergingStrategy": "ALLGREEN"
}
}
}
}
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
