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. |
|
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 |
.mergify.yml
Outdated
| - 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.
There was a problem hiding this comment.
Frankly not sure even need that since branch protection rules SHOULD cover these. IF we have branch rules set ;)
Reduces duplication since the queue_conditions would happen before merge_conditions.
|
This pull request has been removed from the queue for the following reason: The pull request can't be updated You should look at the reason for the failure and decide if the pull request needs to be fixed or if you want to requeue it. If you want to requeue this pull request, you need to post a comment with the text: |
|
@Mergifyio backport release-1.36.x release-1.35.x release-1.34.x release-1.33.x |
✅ Backports have been created
|
|
Can backport more if we really really need, but that should cover a good chunk back. |
…ses (#6321) * fix(mergify): Mergify config needs adjusting for latest mergify releases * fix(mergify): Add integration test checks * fix(mergify): Add integration test checks * fix(mergify): Add integration test checks * fix(mergify): Use just queue_conditions Reduces duplication since the queue_conditions would happen before merge_conditions. (cherry picked from commit 3f43ac2)
…ses (#6321) * fix(mergify): Mergify config needs adjusting for latest mergify releases * fix(mergify): Add integration test checks * fix(mergify): Add integration test checks * fix(mergify): Add integration test checks * fix(mergify): Use just queue_conditions Reduces duplication since the queue_conditions would happen before merge_conditions. (cherry picked from commit 3f43ac2)
…ses (#6321) * fix(mergify): Mergify config needs adjusting for latest mergify releases * fix(mergify): Add integration test checks * fix(mergify): Add integration test checks * fix(mergify): Add integration test checks * fix(mergify): Use just queue_conditions Reduces duplication since the queue_conditions would happen before merge_conditions. (cherry picked from commit 3f43ac2)
…ses (#6321) * fix(mergify): Mergify config needs adjusting for latest mergify releases * fix(mergify): Add integration test checks * fix(mergify): Add integration test checks * fix(mergify): Add integration test checks * fix(mergify): Use just queue_conditions Reduces duplication since the queue_conditions would happen before merge_conditions. (cherry picked from commit 3f43ac2)
…ses (#6321) (#6326) * fix(mergify): Mergify config needs adjusting for latest mergify releases * fix(mergify): Add integration test checks * fix(mergify): Add integration test checks * fix(mergify): Add integration test checks * fix(mergify): Use just queue_conditions Reduces duplication since the queue_conditions would happen before merge_conditions. (cherry picked from commit 3f43ac2) Co-authored-by: Jason <jason.mcintosh@armory.io>
…ses (#6321) (#6327) * fix(mergify): Mergify config needs adjusting for latest mergify releases * fix(mergify): Add integration test checks * fix(mergify): Add integration test checks * fix(mergify): Add integration test checks * fix(mergify): Use just queue_conditions Reduces duplication since the queue_conditions would happen before merge_conditions. (cherry picked from commit 3f43ac2) Co-authored-by: Jason <jason.mcintosh@armory.io>
…ses (#6321) (#6328) * fix(mergify): Mergify config needs adjusting for latest mergify releases * fix(mergify): Add integration test checks * fix(mergify): Add integration test checks * fix(mergify): Add integration test checks * fix(mergify): Use just queue_conditions Reduces duplication since the queue_conditions would happen before merge_conditions. (cherry picked from commit 3f43ac2) Co-authored-by: Jason <jason.mcintosh@armory.io>
…ses (#6321) (#6329) * fix(mergify): Mergify config needs adjusting for latest mergify releases * fix(mergify): Add integration test checks * fix(mergify): Add integration test checks * fix(mergify): Add integration test checks * fix(mergify): Use just queue_conditions Reduces duplication since the queue_conditions would happen before merge_conditions. (cherry picked from commit 3f43ac2) Co-authored-by: Jason <jason.mcintosh@armory.io>
Couple of changes & new features: