Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(xlineapi): improve is_conflict #932

Merged
merged 4 commits into from
Nov 11, 2024

fix(deps): remove redundant dep

901357c
Select commit
Loading
Failed to load commit list.
Merged

refactor(xlineapi): improve is_conflict #932

fix(deps): remove redundant dep
901357c
Select commit
Loading
Failed to load commit list.
Mergify / Summary succeeded Nov 11, 2024 in 3s

1 rule matches and 5 potential rules

⚠️ The pull request has been merged by @bsbds

Rule: Automatic merge on approval (merge)

  • -closed [📌 merge requirement]
  • any of:
    • #approved-reviews-by >= 2
    • all of:
      • author = dependabot[bot]
      • #approved-reviews-by >= 1
  • #approved-reviews-by >= 1 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
  • #review-threads-unresolved = 0 [🛡 GitHub branch protection]
  • -conflict [📌 merge requirement]
  • -draft
  • -draft [📌 merge requirement]
  • check-success = "Build"
  • check-success = "Commit Message Validation"
  • check-success = "DCO"
  • check-success = "E2E kube (v1.27.3)"
  • check-success = "E2E kube (v1.28.7)"
  • check-success = "E2E kube (v1.29.2)"
  • check-success = "Spell Check"
  • check-success = "Tests Madsim"
  • check-success = "Tests Normal"
  • check-success = "Validation"
  • check-success = "codecov/patch"
  • check-success = "codecov/project"
  • any of: [📌 merge -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success = Configuration changed

Rule: convert to draft (comment, edit, label)

  • any of:
    • check-failure = "Build"
    • check-failure = "E2E kube (v1.27.3)"
    • check-failure = "E2E kube (v1.28.7)"
    • check-failure = "E2E kube (v1.29.2)"
    • check-failure = "Tests Madsim"
    • check-failure = "Tests Normal"
    • check-failure = "Validation"
  • -draft
  • -label = "CI:fail"
  • base = master

Rule: convert to ready-to-review (edit, label)

  • draft
  • label = "CI:fail"
  • base = master
  • check-success = "Build"
  • check-success = "E2E kube (v1.27.3)"
  • check-success = "E2E kube (v1.28.7)"
  • check-success = "E2E kube (v1.29.2)"
  • check-success = "Tests Madsim"
  • check-success = "Tests Normal"
  • check-success = "Validation"

✅ Rule: balanced review assignment (request_reviews)

  • -draft
  • author != dependabot[bot]

Rule: comment when a pull request cannot be merged (comment)

  • conflict
  • -draft

Rule: comment when modify workflow (comment)

  • files ~= ^\.github/workflows/
  • author != dependabot[bot]

💖  Mergify is proud to provide this service for free to open source projects.

🚀  You can help us by becoming a sponsor!


1 not applicable rule

Rule: automatic approval for Dependabot pull requests (review)

  • author = dependabot[bot]
  • -draft
  • check-success = "Build"
  • check-success = "Commit Message Validation"
  • check-success = "DCO"
  • check-success = "E2E kube (v1.27.3)"
  • check-success = "E2E kube (v1.28.7)"
  • check-success = "E2E kube (v1.29.2)"
  • check-success = "Spell Check"
  • check-success = "Tests Madsim"
  • check-success = "Tests Normal"
  • check-success = "Validation"
Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com