Skip to content
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 2 commits into from
Aug 11, 2023
Merged

ci: Preliminary support for GitHub merge queues #13681

merged 2 commits into from
Aug 11, 2023

Conversation

blampe
Copy link
Contributor

@blampe blampe commented Aug 9, 2023

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

  • I have run make tidy to update any new dependencies
  • I have run make lint to verify my code passes the lint check
    • I have formatted my code using gofumpt
  • I have added tests that prove my fix is effective or that my feature works
  • I have run make changelog and committed the changelog/pending/<file> documenting my change
  • Yes, there are changes in this PR that warrants bumping the Pulumi Cloud API version

@blampe blampe requested a review from abhinav August 9, 2023 06:01
@pulumi-bot
Copy link
Contributor

pulumi-bot commented Aug 9, 2023

Changelog

[uncommitted] (2023-08-10)

Miscellaneous

  • [ci] Add preliminary support for GitHub's native merge queues
    #13681

@blampe blampe added the impact/no-changelog-required This issue doesn't require a CHANGELOG update label Aug 9, 2023
@blampe blampe removed the impact/no-changelog-required This issue doesn't require a CHANGELOG update label Aug 9, 2023
@blampe
Copy link
Contributor Author

blampe commented Aug 9, 2023

bors try

bors bot added a commit that referenced this pull request Aug 9, 2023
@bors
Copy link
Contributor

bors bot commented Aug 9, 2023

try

Build failed:

@blampe blampe added the ci/test Test CI pipelines on this PR label Aug 9, 2023
@blampe
Copy link
Contributor Author

blampe commented Aug 9, 2023

bors try

bors bot added a commit that referenced this pull request Aug 9, 2023
@bors
Copy link
Contributor

bors bot commented Aug 9, 2023

try

Build 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>
@blampe
Copy link
Contributor Author

blampe commented Aug 10, 2023

bors try

bors bot added a commit that referenced this pull request Aug 10, 2023
@bors
Copy link
Contributor

bors bot commented Aug 10, 2023

try

Build failed:

@blampe
Copy link
Contributor Author

blampe commented Aug 11, 2023

bors merge

@bors
Copy link
Contributor

bors bot commented Aug 11, 2023

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.
For more help, visit the forum.

If you want to switch to GitHub's built-in merge queue, visit their help page.

@bors bors bot merged commit eeff5ce into master Aug 11, 2023
82 checks passed
@bors bors bot deleted the merge-queues branch August 11, 2023 02:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci/test Test CI pipelines on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants