Could the bot merge master? #21
Comments
|
CC @Bullrich See polkadot-fellows/runtimes#114 (comment) as an example. |
|
Hi @bkchr! I have been running some experiments on this and, unfortunately, it can not be done 😞 This is because a GitHub action can only modify a branch that belongs to the repository, and PRs to polkadot-fellows/runtimes are done from a fork, which does not belong to the repository.
I tried with the existing action autoupdate which provides exactly the features that you need but also had the same problem. A possible solution for this could be merge-queues which @alvicsam has implemented in paritytech/polkadot-sdk. It requires a trickier setup, but it was developed for this particular purpose. Let me know what you think. |
|
And what is with this? https://github.com/adRise/update-pr-branch |
This one uses a different method. Seems to be kind of new (we didn't knew about it and had only tried with the old fashioned method). Thanks, it seems that this could be the solution for our problem! I experimented with it and noticed different behaviours based on this checkbox: If it is off, it throws an error:
If it is on, it works by default. The only problem that I see is that it doesn't have error handling of a failed case, so if one of the PRs have this check disabled, it will throw the whole process. The task itself is quite small. I think I can make a small action using this method that will fulfill this requirements in no time. |
Added action to keep pull requests up to date. Every time master receives a push, it will look for all the PRs and sync them with the master branch. This only works when the PR has `auto-merge` enabled (it can be enabled for all PRs too if required). Merging this PR will count as solving paritytech/auto-merge-bot#21 and paritytech/up-to-date-action#1 We use a github app to solve the issue that tests would not run if the credentials comes from a github action.
|
A PR with the action has been created in polkadot-fellows/runtimes#139. It uses the newly created action |
Added action to keep pull requests up to date. Every time master receives a push, it will look for all the PRs and sync them with the master branch. This only works when the PR has `auto-merge` enabled (it can be enabled for all PRs too if required). Merging this PR will count as solving paritytech/auto-merge-bot#21 and paritytech/up-to-date-action#1 We use a github app to solve the issue that tests would not run if the credentials comes from a github action. I'm resuing the credentials for the [`fellowship-merge-bot`](https://github.com/apps/fellowship-merge-bot) used in [`auto-merge`](https://github.com/polkadot-fellows/runtimes/blob/main/.github/workflows/auto-merge.yml). It needs to have the following permissions: - Repository permissions: - Pull Requests - [x] Write - Contents - [x] Write
|
Task fulfilled with action Closed by finishing paritytech/up-to-date-action#1 and merging: |
When the branch is out of date, it looks like auto merge is waiting. It would be nice if in such a situation the bot just merges master.
The text was updated successfully, but these errors were encountered: