add mergify to automate our workflow #12255
Conversation
|
Another test: Changing base to master, lets see if the app find this PR (it uses default branch). |
This config should always follow our worklof and other way around. They should both be in sync. What can mergify do? Check PR status (labels, reviewers) and act on it. First step would be to not merge anything, just use labels and help us to keep PRs up to date. Less manual work. If this works, we can get CI to check specific labels to trigger CI (or use commands) and other things, this needs more work.
This will be reverted once mergify works with the PR workflow. One rule for each condition - base is feature-mergify.
|
One drawback, default branch is used for configuration. Thus we won't be able to test this on a feature branch without touching the master. I added a rule to each condition there - Waiting on 6.0.0-alpha1 to complete and then we can test this one. |
0xc0170
changed the title
| remove: | ||
| - "needs: review" | ||
| comment: | ||
| message: This PR cannot be merged due to conflicts. Please rebase to resolve them. |
There was a problem hiding this comment.
Could we also get a conflict when in the 'needs: ci' state ?
There was a problem hiding this comment.
I see, we should remove as well needs: CI, will fix
| - do not merge | ||
|
|
||
| # Check if version label is applied | ||
| - name: release version is a must for merged PRs |
There was a problem hiding this comment.
This will require much more thought in the new release scheme. It is envisaged going forward that prior to actual release another bot will add one of these labels depending on what pr type is specified by the author:
'release-version: patch'
'release-version: minor'
'release-version: major'
Then when we are ready to make the release, the release script will determine the actual semantic version of the release based on the content ....
There was a problem hiding this comment.
I can remove it now or once the release bot is running. This would catch errors, should not cause conflict with the release bot.
|
@0xc0170, thank you for your changes. |
|
Merging this to start testing it on feature-mergify branch today. CI passed, also mergify confirmed the config is valid. |
Summary of changes
The configuration should follow our workflow.
What does mergify do? It acts on the conditions and can do actions. For instance if PR is reviewed, it can add new label, remove review and move to the next stage, and so on. The configuration is in the root, in yml file. It is easy to read and configure.
I documented as much as I could in the configuration to keep ti clear what state the condition is applied to and what a new state will be.
This goes to master as noted below (due to limitation of using the default branch).
Impact of changes
Migration actions required
Documentation
Pull request type
Test results
Reviewers