Prepare for Merge Queue #17183
Prepare for Merge Queue #17183
Conversation
github-actions
bot
added
the
development-process
There was a problem hiding this comment.
i wasn't able to check those via asf boxer (got a permission error on creating a new project). I checked other ASF projects so should be fine - but just in case I will take a look on the checks once this PR is merged
| @@ -50,8 +50,38 @@ github: | |||
| main: | |||
| required_pull_request_reviews: | |||
| required_approving_review_count: 1 | |||
| required_status_checks: | |||
| strict: true # Require branches to be up to date before merging | |||
There was a problem hiding this comment.
Can we not require up to date branches before we have enabled the merge queue? Otherwise that will slow down merging of PRs as we'll have a bottleneck / race for each PR that wants to merge
Once there is an automated queue it makes sense because the queue handles the race
| required_status_checks: | ||
| strict: true # Require branches to be up to date before merging | ||
| contexts: | ||
| - "Check License Header" |
There was a problem hiding this comment.
I worry about this list
- It may get out of date if people add a new check
- I worry this might break the repo entirely (if we for example, change the name of one of these files)
- What happens to workflows that don't run all these checks (like documentation, for example)
I am particularly worried about the note in https://github.com/apache/infrastructure-asfyaml/blob/main/README.md#branch-protection
A typo in these settings for the default branch will prevent you from modifying the .asf.yaml file itself.
I think it is better to potentially have main fail some CI checks that we can fix rather than effectively locking ourselves out of committing anything
Which issue does this PR close?
Related to #6880
Rationale for this change
Before we enable Merge Queue, we need to prepare our CI
What changes are included in this PR?
Merge Queue only waits for the required steps - us all checks are important hence I made them all required.
It'll become impossible to merge a PR if some of the checks are not passed, but I believe that's the flow we use now anyways.
I also added a MQ trigger as required in the MQ docs
Demo PR: blaginin-org#1