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(baseapp)!: Halt at height now does not produce the halt height block (backport #21256) #21323

Merged
merged 4 commits into from
Aug 16, 2024

conflicts

3e5e693
Select commit
Loading
Failed to load commit list.
Merged

fix(baseapp)!: Halt at height now does not produce the halt height block (backport #21256) #21323

conflicts
3e5e693
Select commit
Loading
Failed to load commit list.
Mergify / Summary succeeded Aug 16, 2024 in 1s

1 rule matches

⚠️ The pull request has been merged by @julienrbrt

‼️ Action Required ‼️

The configuration uses the deprecated commit_message_template attribute of the queue action in one or more pull_request_rules. It must now be used under the queue_rules configuration.
A brownout is planned on August 26th, 2024.
This option will be removed on September 23rd, 2024.
For more information: https://docs.mergify.com/configuration/file-format/#queue-rules

‼️ Action Required ‼️

The configuration uses the deprecated merge_method attribute of the queue action in one or more pull_request_rules. It must now be used under the queue_rules configuration.
A brownout is planned on August 26th, 2024.
This option will be removed on September 23rd, 2024.
For more information: https://docs.mergify.com/configuration/file-format/#queue-rules

<hr />

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

🚀  You can help us by becoming a sponsor!


6 not applicable rules

Rule: automerge to main with label automerge and branch protection passing (queue)

  • base=main
  • label=A:automerge
  • #approved-reviews-by>1
  • -draft [📌 queue requirement]
  • any of: [📌 queue -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success=Configuration changed
  • any of: [🔀 queue conditions]
    • all of: [📌 queue conditions of queue default]
      • #approved-reviews-by>=1 [🛡 GitHub branch protection]
      • #changes-requested-reviews-by=0 [🛡 GitHub branch protection]
      • branch-protection-review-decision=APPROVED [🛡 GitHub branch protection]
      • any of: [🛡 GitHub branch protection]
        • check-success=tests (00)
        • check-neutral=tests (00)
        • check-skipped=tests (00)
      • any of: [🛡 GitHub branch protection]
        • check-success=tests (01)
        • check-neutral=tests (01)
        • check-skipped=tests (01)
      • any of: [🛡 GitHub branch protection]
        • check-success=tests (02)
        • check-neutral=tests (02)
        • check-skipped=tests (02)
      • any of: [🛡 GitHub branch protection]
        • check-success=tests (03)
        • check-neutral=tests (03)
        • check-skipped=tests (03)
      • 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-integration
        • check-neutral=test-integration
        • check-skipped=test-integration
      • any of: [🛡 GitHub branch protection]
        • check-success=build (arm64)
        • check-neutral=build (arm64)
        • check-skipped=build (arm64)
      • any of: [🛡 GitHub branch protection]
        • check-success=golangci-lint
        • check-neutral=golangci-lint
        • check-skipped=golangci-lint

Rule: backport patches to v0.52.x branch (backport)

  • base=main
  • label=backport/v0.52.x
  • merged [📌 backport requirement]

Rule: backport patches to v0.50.x branch (backport)

  • base=main
  • label=backport/v0.50.x
  • merged [📌 backport requirement]

Rule: backport patches to v0.47.x branch (backport)

  • base=main
  • label=backport/v0.47.x
  • merged [📌 backport requirement]

Rule: backport patches to v0.46.x branch (backport)

  • base=main
  • label=backport/0.46.x
  • merged [📌 backport requirement]

Rule: backport patches to v0.45.x branch (backport)

  • base=main
  • label=backport/0.45.x
  • merged [📌 backport requirement]
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