-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
ci: Preliminary support for GitHub merge queues #13681
Merged
Merged
Conversation
This file contains 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
Changelog[uncommitted] (2023-08-10)Miscellaneous
|
abhinav
approved these changes
Aug 9, 2023
blampe
added
the
impact/no-changelog-required
This issue doesn't require a CHANGELOG update
label
Aug 9, 2023
blampe
removed
the
impact/no-changelog-required
This issue doesn't require a CHANGELOG update
label
Aug 9, 2023
bors try |
tryBuild failed: |
bors try |
tryBuild failed: |
bors bot
added a commit
to pulumi/watchutil-rs
that referenced
this pull request
Aug 9, 2023
37: ci: Preliminary support for GitHub merge queues r=blampe a=blampe It occurred to me that `@AaronFriel` had setup this repo to test Bors. It would make sense to also use it as a guinea pig for merge queues before landing pulumi/pulumi#13681. Co-authored-by: Bryce Lampe <bryce@pulumi.com>
bors bot
added a commit
to pulumi/watchutil-rs
that referenced
this pull request
Aug 9, 2023
37: ci: Preliminary support for GitHub merge queues r=blampe a=blampe It occurred to me that `@AaronFriel` had setup this repo to test Bors. It would make sense to also use it as a guinea pig for merge queues before landing pulumi/pulumi#13681. Co-authored-by: Bryce Lampe <bryce@pulumi.com>
bors bot
added a commit
to pulumi/watchutil-rs
that referenced
this pull request
Aug 9, 2023
37: ci: Preliminary support for GitHub merge queues r=blampe a=blampe It occurred to me that `@AaronFriel` had setup this repo to test Bors. It would make sense to also use it as a guinea pig for merge queues before landing pulumi/pulumi#13681. Co-authored-by: Bryce Lampe <bryce@pulumi.com>
bors bot
added a commit
to pulumi/watchutil-rs
that referenced
this pull request
Aug 9, 2023
37: ci: Preliminary support for GitHub merge queues r=blampe a=blampe It occurred to me that `@AaronFriel` had setup this repo to test Bors. It would make sense to also use it as a guinea pig for merge queues before landing pulumi/pulumi#13681. Co-authored-by: Bryce Lampe <bryce@pulumi.com>
bors bot
added a commit
to pulumi/watchutil-rs
that referenced
this pull request
Aug 10, 2023
37: ci: Preliminary support for GitHub merge queues r=blampe a=blampe It occurred to me that `@AaronFriel` had setup this repo to test Bors. It would make sense to also use it as a guinea pig for merge queues before landing pulumi/pulumi#13681. Co-authored-by: Bryce Lampe <bryce@pulumi.com>
bors try |
tryBuild failed: |
bors merge |
Build succeeded! The publicly hosted instance of bors-ng is deprecated and will go away soon. If you want to self-host your own instance, instructions are here. If you want to switch to GitHub's built-in merge queue, visit their help page. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
See managing a merge queue.
This is a no-op that makes it possible to begin experimenting with GitHub's native merge queues when the team is ready to do so. It does not change anything about existing workflows -- Bors is still required.
After this lands, actually testing the merge queue (and eventually cutting over) will require some coordination. Someone with admin access on the repo will need to edit branch protections to no longer require a Bors check and instead require the merge queue. Some test PRs can be landed while these protections are flipped, but real PRs should not be until the new workflow is confirmed to be working as expected.
Refs #13501
Checklist
make tidy
to update any new dependenciesmake lint
to verify my code passes the lint checkgofumpt
make changelog
and committed thechangelog/pending/<file>
documenting my change