chore: mergify does no longer support queue_conditions != merge_condi…#5891
chore: mergify does no longer support queue_conditions != merge_condi…#5891
Conversation
…tions for require status checks to be up to date > Configuration not compatible with a branch protection setting The branch protection setting Require branches to be up to date before merging is not compatible with max_parallel_checks>1, queue_conditions != merge_conditions and must be unset.
🦙 MegaLinter status:
|
| Descriptor | Linter | Files | Fixed | Errors | Elapsed time |
|---|---|---|---|---|---|
| ✅ EDITORCONFIG | editorconfig-checker | 1 | 0 | 0.0s | |
| ✅ REPOSITORY | gitleaks | yes | no | 2.76s | |
| ✅ REPOSITORY | git_diff | yes | no | 0.01s | |
| ✅ REPOSITORY | grype | yes | no | 12.82s | |
| ✅ REPOSITORY | secretlint | yes | no | 1.31s | |
| ✅ REPOSITORY | trivy-sbom | yes | no | 0.39s | |
| ✅ REPOSITORY | trufflehog | yes | no | 3.79s | |
| prettier | 1 | 1 | 0.26s | ||
| ✅ YAML | v8r | 1 | 0 | 1.54s |
See detailed report in MegaLinter reports
Set VALIDATE_ALL_CODEBASE: true in mega-linter.yml to validate all sources, not only the diff
|
Actually idk if this resolves the problem https://github.com/nektos/act/runs/47170098045 The mergify config editor can successfully parse this change and shows that merge and queue conditions are the same ref #5889 |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #5891 +/- ##
==========================================
+ Coverage 74.65% 74.78% +0.13%
==========================================
Files 73 73
Lines 11139 11190 +51
==========================================
+ Hits 8316 8369 +53
+ Misses 2186 2185 -1
+ Partials 637 636 -1 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
Hi @cplee, Manual Merge required, I can understand from a security point of view why mergify is not using the changed config to merge this PR. |
…tions for require status checks to be up to date