Prepare switch to GitHub merge queue #3483
Merged
Conversation
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
bradjc
approved these changes
Jun 14, 2023
alistair23
approved these changes
Jun 15, 2023
alevy
approved these changes
Jun 15, 2023
|
bors r+ |
|
Configuration problem: |
Should we merge this manually? |
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.
Pull Request Overview
This pull request removes the bors-ng configuration, and enables GitHub actions workflows to run on the
merge_grouptrigger, as required by the GitHub actions merge queue workflow. When this pull request is merged, we can enable the GitHub merge queue in the branch protection settings of the repository. Fixes #3428.While we discussed testing these changes on a lower-impact repository such as
libtock-cfirst, I'm opening this PR ontock/tocknow as I've tested these exact commits with a fork, this repository has more traffic letting us notice any issues quickly, and in the worst case we can switch back & revert changes pretty easily.Testing Strategy
This pull request was tested by enabling the merge-queue on a fork of this repository.
TODO or Help Wanted
As soon as this PR is merged, we'd need to enable the merge-queue in the repository settings.
From initial tests, it seems that we risk increasing the GitHub actions CI utilization with the merge queue compared to bors, and would want to fine-tune when (in response to which triggers) workflows are run.
When this is merged and confirmed to work, we'd want to update
docs/to document the new workflow.Documentation Updated
/docs, or no updates are required.Formatting
make prepush.