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

Revert "fix unnecessary merge scope in broadcast join (#17778)" #17787

Merged
merged 2 commits into from
Jul 30, 2024

Merge branch 'main' into revert

2ae7c14
Select commit
Loading
Failed to load commit list.
Merged

Revert "fix unnecessary merge scope in broadcast join (#17778)" #17787

Merge branch 'main' into revert
2ae7c14
Select commit
Loading
Failed to load commit list.
Mergify / Summary succeeded Jul 30, 2024 in 1s

2 rules match and 7 potential 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

‼️ 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

✅ Rule: Automatic queue on approval for main (queue)

  • #changes-requested-reviews-by<=0
  • -draft [📌 queue requirement]
  • base=main
  • label!=do-not-merge/wip
  • any of: [📌 queue -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success=Configuration changed
  • any of: [🔀 queue conditions]
    • all of: [📌 queue conditions of queue main]
      • #approved-reviews-by>=1 [🛡 GitHub branch protection]
      • #changes-requested-reviews-by=0 [🛡 GitHub branch protection]
      • #review-threads-unresolved=0 [🛡 GitHub branch protection]
      • branch-protection-review-decision=APPROVED [🛡 GitHub branch protection]
      • any of: [🛡 GitHub branch protection]
        • check-success=Matrixone Compose CI / multi cn e2e bvt test docker compose(PESSIMISTIC)
        • check-neutral=Matrixone Compose CI / multi cn e2e bvt test docker compose(PESSIMISTIC)
        • check-skipped=Matrixone Compose CI / multi cn e2e bvt test docker compose(PESSIMISTIC)
      • any of: [🛡 GitHub branch protection]
        • check-success=Matrixone Standlone CI / Multi-CN e2e BVT Test on Linux/x64(LAUNCH, PROXY)
        • check-neutral=Matrixone Standlone CI / Multi-CN e2e BVT Test on Linux/x64(LAUNCH, PROXY)
        • check-skipped=Matrixone Standlone CI / Multi-CN e2e BVT Test on Linux/x64(LAUNCH, PROXY)
      • any of: [🛡 GitHub branch protection]
        • check-success=Matrixone Standlone CI / e2e BVT Test on Linux/x64(LAUNCH, PESSIMISTIC)
        • check-neutral=Matrixone Standlone CI / e2e BVT Test on Linux/x64(LAUNCH, PESSIMISTIC)
        • check-skipped=Matrixone Standlone CI / e2e BVT Test on Linux/x64(LAUNCH, PESSIMISTIC)
      • any of: [🛡 GitHub branch protection]
        • check-success=Matrixone CI / SCA Test on Ubuntu/x86
        • check-neutral=Matrixone CI / SCA Test on Ubuntu/x86
        • check-skipped=Matrixone CI / SCA Test on Ubuntu/x86
      • any of: [🛡 GitHub branch protection]
        • check-success=Matrixone CI / UT Test on Ubuntu/x86
        • check-neutral=Matrixone CI / UT Test on Ubuntu/x86
        • check-skipped=Matrixone CI / UT Test on Ubuntu/x86
      • any of: [🛡 GitHub branch protection]
        • check-success=Matrixone Compose CI / multi cn e2e bvt test docker compose(Optimistic/PUSH)
        • check-neutral=Matrixone Compose CI / multi cn e2e bvt test docker compose(Optimistic/PUSH)
        • check-skipped=Matrixone Compose CI / multi cn e2e bvt test docker compose(Optimistic/PUSH)
      • any of: [🛡 GitHub branch protection]
        • check-success=Matrixone Standlone CI / e2e BVT Test on Linux/x64(LAUNCH,Optimistic)
        • check-neutral=Matrixone Standlone CI / e2e BVT Test on Linux/x64(LAUNCH,Optimistic)
        • check-skipped=Matrixone Standlone CI / e2e BVT Test on Linux/x64(LAUNCH,Optimistic)
      • any of: [🛡 GitHub branch protection]
        • check-success=Matrixone Upgrade CI / Compatibility Test With Target on Linux/x64(LAUNCH)
        • check-neutral=Matrixone Upgrade CI / Compatibility Test With Target on Linux/x64(LAUNCH)
        • check-skipped=Matrixone Upgrade CI / Compatibility Test With Target on Linux/x64(LAUNCH)
      • any of: [🛡 GitHub branch protection]
        • check-success=Matrixone Upgrade CI / Compatibility Test With Release on Linux/x64(LAUNCH)
        • check-neutral=Matrixone Upgrade CI / Compatibility Test With Release on Linux/x64(LAUNCH)
        • check-skipped=Matrixone Upgrade CI / Compatibility Test With Release on Linux/x64(LAUNCH)

Rule: Auto update branch (update)

  • #commits-behind>0 [📌 update requirement]
  • -closed [📌 update requirement]
  • created-at>=00:10 ago
  • -conflict [📌 update requirement]
  • queue-position=-1 [📌 update requirement]

✅ Rule: label for Bug (label)

  • body~=(?im)- \[x\] BUG

Rule: label for Feature (label)

  • body~=(?im)- \[x\] Feature

Rule: label for Improvement (label)

  • body~=(?im)- \[x\] Improvement

Rule: label for Documentation (label)

  • body~=(?im)- \[x\] Documentation

Rule: label for Test and CI (label)

  • body~=(?im)- \[x\] Test and CI

Rule: label for Code Refactoring (label)

  • body~=(?im)- \[x\] Code Refactoring

Rule: label for API-change (label)

  • body~=(?im)- \[x\] API-change

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

🚀  You can help us by becoming a sponsor!


2 not applicable rules

Rule: Automatic queue on approval for release-1.2 (queue)

  • approved-reviews-by=sukki37
  • base=1.2-dev
  • #changes-requested-reviews-by<=0
  • -draft [📌 queue requirement]
  • label!=do-not-merge/wip
  • any of: [📌 queue -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success=Configuration changed
  • any of: [🔀 queue conditions]
    • all of: [📌 queue conditions of queue release-1.2]
      • #approved-reviews-by>=1 [🛡 GitHub branch protection]
      • #changes-requested-reviews-by=0 [🛡 GitHub branch protection]
      • #review-threads-unresolved=0 [🛡 GitHub branch protection]
      • branch-protection-review-decision=APPROVED [🛡 GitHub branch protection]
      • any of: [🛡 GitHub branch protection]
        • check-success=Matrixone Compose CI / multi cn e2e bvt test docker compose(PESSIMISTIC)
        • check-neutral=Matrixone Compose CI / multi cn e2e bvt test docker compose(PESSIMISTIC)
        • check-skipped=Matrixone Compose CI / multi cn e2e bvt test docker compose(PESSIMISTIC)
      • any of: [🛡 GitHub branch protection]
        • check-success=Matrixone Standlone CI / Multi-CN e2e BVT Test on Linux/x64(LAUNCH, PROXY)
        • check-neutral=Matrixone Standlone CI / Multi-CN e2e BVT Test on Linux/x64(LAUNCH, PROXY)
        • check-skipped=Matrixone Standlone CI / Multi-CN e2e BVT Test on Linux/x64(LAUNCH, PROXY)
      • any of: [🛡 GitHub branch protection]
        • check-success=Matrixone Standlone CI / e2e BVT Test on Linux/x64(LAUNCH, PESSIMISTIC)
        • check-neutral=Matrixone Standlone CI / e2e BVT Test on Linux/x64(LAUNCH, PESSIMISTIC)
        • check-skipped=Matrixone Standlone CI / e2e BVT Test on Linux/x64(LAUNCH, PESSIMISTIC)
      • any of: [🛡 GitHub branch protection]
        • check-success=Matrixone CI / SCA Test on Ubuntu/x86
        • check-neutral=Matrixone CI / SCA Test on Ubuntu/x86
        • check-skipped=Matrixone CI / SCA Test on Ubuntu/x86
      • any of: [🛡 GitHub branch protection]
        • check-success=Matrixone CI / UT Test on Ubuntu/x86
        • check-neutral=Matrixone CI / UT Test on Ubuntu/x86
        • check-skipped=Matrixone CI / UT Test on Ubuntu/x86
      • any of: [🛡 GitHub branch protection]
        • check-success=Matrixone Compose CI / multi cn e2e bvt test docker compose(Optimistic/PUSH)
        • check-neutral=Matrixone Compose CI / multi cn e2e bvt test docker compose(Optimistic/PUSH)
        • check-skipped=Matrixone Compose CI / multi cn e2e bvt test docker compose(Optimistic/PUSH)
      • any of: [🛡 GitHub branch protection]
        • check-success=Matrixone Standlone CI / e2e BVT Test on Linux/x64(LAUNCH,Optimistic)
        • check-neutral=Matrixone Standlone CI / e2e BVT Test on Linux/x64(LAUNCH,Optimistic)
        • check-skipped=Matrixone Standlone CI / e2e BVT Test on Linux/x64(LAUNCH,Optimistic)
      • any of: [🛡 GitHub branch protection]
        • check-success=Matrixone Upgrade CI / Compatibility Test With Target on Linux/x64(LAUNCH)
        • check-neutral=Matrixone Upgrade CI / Compatibility Test With Target on Linux/x64(LAUNCH)
        • check-skipped=Matrixone Upgrade CI / Compatibility Test With Target on Linux/x64(LAUNCH)
      • any of: [🛡 GitHub branch protection]
        • check-success=Matrixone Upgrade CI / Compatibility Test With Release on Linux/x64(LAUNCH)
        • check-neutral=Matrixone Upgrade CI / Compatibility Test With Release on Linux/x64(LAUNCH)
        • check-skipped=Matrixone Upgrade CI / Compatibility Test With Release on Linux/x64(LAUNCH)

Rule: Auto Request Reviewer For 1.2-dev (request_reviews)

  • base!=main
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