-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Proposal: Configure merge_queue on the repository (to replace tide) #9164
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
a3ed0cf to
c4c5823
Compare
|
Arf, I messed up the workflow, let me try to fix. |
c4c5823 to
b171e67
Compare
b171e67 to
f8bdf2f
Compare
f8bdf2f to
a2d21b1
Compare
|
Ohhhh @afrittoli @aThorp96 does the file change only get the latest commit of a PR ? if yes, this would explain why it is skipping stuff here - and it's a problem.. |
b856781 to
a2d21b1
Compare
|
|
|
I don't understand why it doesn't set non-docs to true in https://github.com/tektoncd/pipeline/actions/runs/19699931375/job/56433464823?pr=9164 🤔 |
53f4787 to
a2d21b1
Compare
|
Will need #9176 🙃 |
|
or #9137 |
…ge_queue - Add merge_group for event triggering - Add a minimal parameter to the e2e-matrix so that we run only one set of e2e tests on merge. - Update DEVELOPMENT.md to explain the mergue queue implementation. Signed-off-by: Vincent Demeester <vdemeest@redhat.com>
This uses a job to generate the matrix (hard coded today, we could definitely generate it from other inputs as well) instead of using the matrix syntax. Signed-off-by: Vincent Demeester <vdemeest@redhat.com>
a2d21b1 to
6341b15
Compare
|
/retest |
|
/hold |
Changes
Summary
This PR proposes to add support for GitHub's merge queue to automate PR merging and ensure the
mainbranch remains stable. The merge queue validates that approved PRs work correctly when merged with the latestmainbefore allowing them to land.merge_groupevents in addition topull_request:This optimization reduces merge queue CI time and flakyness while maintaining safety, since PRs already pass the full matrix during review. It also helps not overriding to much the runners.
DEVELOPMENT.mdTesting
The workflow changes are backward compatible:
merge_grouptrigger is additive and only activates when merge queue is enabledminimalparameter defaults tofalse, preserving full matrix behavior for existing callersNext Steps
Before merging this PR, deciding whether we want to take this approach or not. This is a proposal/exploration, but we can definitely decide to keep using tide.
After merging this PR, repository administrators will need to:
mainSubmitter Checklist
As the author of this PR, please check off the items in this checklist:
/kind <type>. Valid types are bug, cleanup, design, documentation, feature, flake, misc, question, tepRelease Notes