fix(mergify): Mergify config needs adjusting for latest mergify releases #6321
Conversation
|
To note I see this as mostly the same that should be applied across ALL spinnaker projects.. Post-discussion here, will create additional PRs. |
|
Any links to mergify docs/announcements about the changes? |
|
https://changelog.mergify.com/ they've got a LARGE changelog. https://docs.mergify.com/configuration/file-format/#queue-rules has some of this including some of the deprecated fields that are going away. |
| - status-success=build | ||
| merge_method: squash | ||
| queue_conditions: | ||
| - check-success=build |
There was a problem hiding this comment.
One bizarre thing: I couldn't find the previous "status-success" field anyplace in mergify docs...
There was a problem hiding this comment.
Mergifyio/mergify#2039 only place I found which had me wondering if something was "off" for a long time :(
|
Added the it-test checks. Matrix builds.. apparently cause major headaches for mergify :( |
|
Additionally can test any flows, conditions, etc. via their simulator: https://dashboard.mergify.com/workflow-automation?repository=clouddriver&login=spinnaker |
| - check-success=it-test | ||
| merge_conditions: | ||
| - check-success=build | ||
| - check-success=it-test |
There was a problem hiding this comment.
I WILL note - mergify obeys/automatically checks branch protection rules, aka... if we set these in the branch protection rules IN THEORY that should take care of all of this vs. needing to set in the mergify config. These let you adjust and work with branch protection rules, so if we wanted to tweak for additional checks or other stuff we can... I've not seen our branch protection rules to compare though.
| conditions: | ||
| - status-success=build | ||
| merge_method: squash | ||
| queue_conditions: |
There was a problem hiding this comment.
From https://docs.mergify.com/configuration/file-format/#queue-rules it looks like we don't need to duplicate queue_conditions in merge_conditions. From https://docs.mergify.com/merge-queue/setup/#configuring-the-merge-queue-rules it looks like we only need one. I'd probably stick with queue_conditions and ditch merge_conditions.
Couple of changes & new features: