Repository navigation
ci: Stop requiring PR branches to be up to date with main before merging - #17
Merged
Merged
Conversation
alamb
approved these changes
Sep 23, 2026
Contributor
|
Thanks @mbutrovich -- I think we should get this repo moving fast, so I suggest we merge PRs aggressively for a while until it settles down |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Which issue does this PR close?
Closes #16.
Rationale for this change
strict: trueunderrequired_status_checksforces every approved PR to click "Update branch" and rerun CI whenever another PR merges, even without conflicts. Removing it matchesapache/datafusion, which lists required checks withoutstrict: https://github.com/apache/datafusion/blob/7570366fd929daf9ced744bb8397686b50565b18/.asf.yaml#L54-L55What changes are included in this PR?
This removes
strict: trueand its comment from.asf.yaml. ASF infra defaultsstricttofalsewhen it isn't set: https://github.com/apache/infrastructure-asfyaml/blob/63cc23dc61b2290b9b09c243ef04b4ca11ba24d3/README.md#L612-L627The required checks (
Format,Clippy,Test,asf-allowlist-check) don't change.The tradeoff is that CI no longer tests the merged commit before it lands on
main. If we want that, a merge queue is the alternative, as #16 describes.Are these changes tested?
No. This only changes branch protection settings. ASF infra applies them after the PR merges.
Are there any user-facing changes?
No.