updated auto-merge-bot to 1.0.1 #220
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
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.
ggwpez
approved these changes
Mar 6, 2024
|
/merge |
|
Enabled Available commands
For more information see the documentation |
Failed to update PR ❌There was an error while trying to keep this PR You may have conflicts More info in the logs 📋 |
Failed to update PR ❌There was an error while trying to keep this PR You may have conflicts More info in the logs 📋 |
muharem
approved these changes
Mar 13, 2024
ordian
approved these changes
Mar 14, 2024
Failed to update PR ❌There was an error while trying to keep this PR You may have conflicts More info in the logs 📋 |
This new version contains: - paritytech/get-fellow-action#15 - Fixed a bug where candidates (`rank 0`) counted as fellows. - Now we filter anyone whose rank is below 1. - paritytech/get-fellow-action#16 - Fixes a problem where a fellow using a superidentity wouldn't appear. - paritytech/get-fellow-action#17 - We upgraded the system to work with `papi` and with `smoldot`. - We are **bleeding edge** now!
It is more safe to use an action that has been developed by github themselves than by an external party.
auto-merge was automatically disabled
March 18, 2024 14:44
Head branch was pushed to by a user without write access
|
/merge cancel |
|
@bkchr I updated the PR to contain an update to the This new version contains:
|
|
/merge |
|
Disabled Available commands
For more information see the documentation |
|
Enabled Available commands
For more information see the documentation |
bkchr
approved these changes
Mar 18, 2024
fellowship-merge-bot
bot
merged commit d39b052
into
polkadot-fellows:main
31 of 32 checks passed
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.
This upgrade contains the change in paritytech/auto-merge-bot#25 which fixes the problem with unstable branches.
The problem
When the
/mergecommand 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
unstablePRs.An unstable PR is a PR that can be merged, but a non required status check is failing.
So, if a user invoked the
/mergecommand 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-actionhas been upgraded to1.1.0This new version contains:
rank 0) counted as fellows.papiand withsmoldot.replaced token generation script for github's
We replaced the action used to generate a token from a github app, originally
tibdex/github-app-tokenforactions/create-github-app-tokenIt is more safe to use an action that has been developed by github themselves than by an external party.