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

fix: fix the canon 4 upgrade #2641

Merged
merged 2 commits into from
Dec 11, 2024

Merge branch 'main' into sai/fix_canon_4_upgrade

b8aa1b4
Select commit
Loading
Failed to load commit list.
Merged

fix: fix the canon 4 upgrade #2641

Merge branch 'main' into sai/fix_canon_4_upgrade
b8aa1b4
Select commit
Loading
Failed to load commit list.
Mergify / Summary succeeded Dec 11, 2024 in 0s

4 potential rules

⚠️ The pull request has been merged by @gsk967

Rule: Automatic merge on approval (merge)

  • -closed [📌 merge requirement]
  • label=A:Automerge
  • any of: [🛡 GitHub branch protection]
    • check-neutral = Run golangci-lint
    • check-skipped = Run golangci-lint
    • check-success = Run golangci-lint
  • #approved-reviews-by >= 1 [🛡 GitHub branch protection]
  • #approved-reviews-by>=1
  • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
  • #commits-behind = 0 [🛡 GitHub branch protection]
  • #review-threads-unresolved = 0 [🛡 GitHub branch protection]
  • -conflict [📌 merge requirement]
  • -draft [📌 merge requirement]
  • base=main
  • any of: [📌 merge -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success = Configuration changed
  • any of: [🛡 GitHub branch protection]
    • check-success = test-e2e
    • check-neutral = test-e2e
    • check-skipped = test-e2e
  • any of: [🛡 GitHub branch protection]
    • check-success = test-unit-cover
    • check-neutral = test-unit-cover
    • check-skipped = test-unit-cover
  • any of: [🛡 GitHub branch protection]
    • check-success = liveness-test
    • check-neutral = liveness-test
    • check-skipped = liveness-test
  • any of: [🛡 GitHub branch protection]
    • check-success = umeed darwin-amd64
    • check-neutral = umeed darwin-amd64
    • check-skipped = umeed darwin-amd64
  • any of: [🛡 GitHub branch protection]
    • check-success = umeed darwin-arm64
    • check-neutral = umeed darwin-arm64
    • check-skipped = umeed darwin-arm64
  • any of: [🛡 GitHub branch protection]
    • check-success = umeed linux-amd64
    • check-neutral = umeed linux-amd64
    • check-skipped = umeed linux-amd64
  • any of: [🛡 GitHub branch protection]
    • check-success = umeed linux-arm64
    • check-neutral = umeed linux-arm64
    • check-skipped = umeed linux-arm64
  • any of: [🛡 GitHub branch protection]
    • check-success = PR Title Linter
    • check-neutral = PR Title Linter
    • check-skipped = PR Title Linter
  • any of: [🛡 GitHub branch protection]
    • check-success = test-app-non-determinism
    • check-neutral = test-app-non-determinism
    • check-skipped = test-app-non-determinism
  • any of: [🛡 GitHub branch protection]
    • check-success = markdown-lint
    • check-neutral = markdown-lint
    • check-skipped = markdown-lint

Rule: Automatic merge on approval (queue)

  • -closed [📌 queue requirement]
  • label=A:Automerge
  • any of: [🔀 queue conditions]
    • all of: [📌 queue conditions of queue default]
      • any of: [🛡 GitHub branch protection]
        • check-neutral = Run golangci-lint
        • check-skipped = Run golangci-lint
        • check-success = Run golangci-lint
      • #approved-reviews-by >= 1 [🛡 GitHub branch protection]
      • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
      • #review-threads-unresolved = 0 [🛡 GitHub branch protection]
      • any of: [🛡 GitHub branch protection]
        • check-success = test-e2e
        • check-neutral = test-e2e
        • check-skipped = test-e2e
      • any of: [🛡 GitHub branch protection]
        • check-success = test-unit-cover
        • check-neutral = test-unit-cover
        • check-skipped = test-unit-cover
      • any of: [🛡 GitHub branch protection]
        • check-success = liveness-test
        • check-neutral = liveness-test
        • check-skipped = liveness-test
      • any of: [🛡 GitHub branch protection]
        • check-success = umeed darwin-amd64
        • check-neutral = umeed darwin-amd64
        • check-skipped = umeed darwin-amd64
      • any of: [🛡 GitHub branch protection]
        • check-success = umeed darwin-arm64
        • check-neutral = umeed darwin-arm64
        • check-skipped = umeed darwin-arm64
      • any of: [🛡 GitHub branch protection]
        • check-success = umeed linux-amd64
        • check-neutral = umeed linux-amd64
        • check-skipped = umeed linux-amd64
      • any of: [🛡 GitHub branch protection]
        • check-success = umeed linux-arm64
        • check-neutral = umeed linux-arm64
        • check-skipped = umeed linux-arm64
      • any of: [🛡 GitHub branch protection]
        • check-success = PR Title Linter
        • check-neutral = PR Title Linter
        • check-skipped = PR Title Linter
      • any of: [🛡 GitHub branch protection]
        • check-success = test-app-non-determinism
        • check-neutral = test-app-non-determinism
        • check-skipped = test-app-non-determinism
      • any of: [🛡 GitHub branch protection]
        • check-success = markdown-lint
        • check-neutral = markdown-lint
        • check-skipped = markdown-lint
  • #approved-reviews-by>=1
  • -conflict [📌 queue requirement]
  • -draft [📌 queue requirement]
  • base=main
  • any of: [📌 queue -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success = Configuration changed

Rule: Backport patches to the release/v4.0.x branch (backport)

  • label=S:backport/v4.0.x
  • base=main
  • merged [📌 backport requirement]

Rule: Backport patches to the release/v4.1.x branch (backport)

  • label=S:backport/v4.1.x
  • base=main
  • merged [📌 backport requirement]

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

🚀  You can help us by becoming a sponsor!


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