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: Remove Bors #13715

Merged
merged 9 commits into from
Aug 12, 2023
Merged

ci: Remove Bors #13715

merged 9 commits into from
Aug 12, 2023

Conversation

blampe
Copy link
Contributor

@blampe blampe commented Aug 11, 2023

Description

This PR removes Bors in favor of native GitHub merge queues. A very similar
cutover was tested and verified in
pulumi/watchutil-rs#39.

Deployment plan

  • Find some time where PRs aren't being merged. This is mostly to minimize confusion
    while we're futzing with branch protections.
  • Update the repo's branch protection rules to match
    Small PR for testing merge queue watchutil-rs#38:
    • "Allow specified actors to bypass required pull requests": "bors" → Unchecked
    • "Status checks that are required": "bors" → "ci-ok"
    • "Require merge queue": Unchecked → Checked
      • "Only merge non-failing pull requests" → Unchecked
      • "Merge method" → Squash and merge
  • Merge this PR using the "Merge when ready" button.
    • If it merges successfully: confirm the prepare-release step ran and published
      pre-release artifacts.
    • If the merge fails: it's possible we'll need to tweak steps slightly
      (e.g. if the step's name doesn't match the branch protection rule). The
      end goal is a "ci-ok" step in both the PR and merge workflows that
      captures whether everything is green.
      • If the issues aren't immediately resolvable, revert the changes made
        to branch protection settings. Folks will continue to merge with
        Bors.

If all goes well, we should be able to continue merging with MQ for a while --
at least long enough to cut a new CLI release. Once we're confident we won't
need to roll back:

Fixes #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
Copy link
Contributor Author

blampe commented Aug 11, 2023

Current dependencies on/for this PR:

This comment was auto-generated by Graphite.

@blampe blampe mentioned this pull request Aug 11, 2023
6 tasks
@pulumi-bot
Copy link
Contributor

pulumi-bot commented Aug 11, 2023

Changelog

[uncommitted] (2023-08-12)

@blampe blampe added impact/no-changelog-required This issue doesn't require a CHANGELOG update and removed do-not-merge labels Aug 11, 2023
@blampe blampe added this pull request to the merge queue Aug 12, 2023
@blampe blampe removed this pull request from the merge queue due to a manual request Aug 12, 2023
@blampe blampe enabled auto-merge August 12, 2023 00:32
@blampe blampe added this pull request to the merge queue Aug 12, 2023
@blampe blampe removed this pull request from the merge queue due to a manual request Aug 12, 2023
@blampe blampe enabled auto-merge August 12, 2023 01:09
auto-merge was automatically disabled August 12, 2023 01:10

Merge queue setting changed

@blampe blampe enabled auto-merge August 12, 2023 01:12
@blampe blampe added this pull request to the merge queue Aug 12, 2023
Merged via the queue into master with commit f3d0feb Aug 12, 2023
45 checks passed
@blampe blampe deleted the remove-bors branch August 12, 2023 02:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
impact/no-changelog-required This issue doesn't require a CHANGELOG update
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Migrate from Bors to GitHub merge queues
3 participants