Allow unstable branches to be merged #25
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
Bullrich
force-pushed
the
unstable-branches
branch
from
aa8027a
to
4f64fb6
Compare
Bullrich
added a commit
to Bullrich/polkadot-fellows-runtimes
that referenced
this pull request
Mar 6, 2024
This upgrade contains the change in paritytech/auto-merge-bot#25 which fixes the problem with unstable branches. ## The problem When the `/merge` command is triggered on a PR that still can't be merge, the bot enables auto-merge. **But**, when the command is run when the PR is ready to merge, the action will fail to enable auto-merge (this is expected). We evaluate the error message, and if it says that the PR is clean, it simply merges the PR. But, we did not handle `unstable` PRs. An unstable PR is a PR that _can be merged, but a **non required status check is failing**._ So, if a user invoked the `/merge` command on a PR that was ready to merge, but a not-required status check was failing, it would crash. This upgrade fixes this problem.
1 task
|
may be that should've been optional param during merge request? so that's not always allowing unstable, but only if developer sure during current request? like does it allow to merge only not required unstable? or all kinds of ? |
fellowship-merge-bot bot
added a commit
to polkadot-fellows/runtimes
that referenced
this pull request
Mar 18, 2024
This upgrade contains the change in paritytech/auto-merge-bot#25 which fixes the problem with unstable branches. ## The problem When the `/merge` command is triggered on a PR that still can't be merge, the bot enables auto-merge. **But**, when the command is run when the PR is ready to merge, the action will fail to enable auto-merge (this is expected). We evaluate the error message, and if it says that the PR is clean, it simply merges the PR. But, we did not handle `unstable` PRs. An unstable PR is a PR that _can be merged, but a **non required status check is failing**._ So, if a user invoked the `/merge` command on a PR that was ready to merge, but a not-required status check was failing, it would crash. This upgrade fixes this problem. ### Other upgrades #### `get-fellows-action` has been upgraded to `1.1.0` This new version contains: - paritytech/get-fellows-action#15 - Fixed a bug where candidates (`rank 0`) counted as fellows. - Now we filter anyone whose rank is below 1. - paritytech/get-fellows-action#16 - Fixes a problem where a fellow using a superidentity wouldn't appear. - This is a particular case that I discovered with @joepetrowski not appearing as a fellow. - This error was also encountered in review bot and fixed in paritytech/review-bot#107 - paritytech/get-fellows-action#11 - We upgraded the system to work with `papi` and with `smoldot`. - We are **bleeding edge** now! #### replaced token generation script for github's We replaced the action used to generate a token from a github app, originally `tibdex/github-app-token` for `actions/create-github-app-token` It is more safe to use an action that has been developed by github themselves than by an external party. --- - [x] Does not require a CHANGELOG entry --------- Co-authored-by: fellowship-merge-bot[bot] <151052383+fellowship-merge-bot[bot]@users.noreply.github.com>
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.
Added the ability to merge unstable branches.
This is enabled by default, as GitHub's Auto Merge feature always merges unstable branches.
Fixes #24