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.

Sign up for GitHub

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 conflict 1.33.x #1053

Closed
wants to merge 3 commits into from

Update StackdriverMetricsService.java

8e34ec7
Select commit
Loading
Failed to load commit list.
Closed

fix conflict 1.33.x #1053

Update StackdriverMetricsService.java
8e34ec7
Select commit
Loading
Failed to load commit list.
Mergify / Summary succeeded Aug 12, 2024 in 0s

no rules match, no planned actions

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

9 not applicable rules

Rule: Automatically merge PRs from maintainers on CI success and review (queue)

  • author=@oss-approvers
  • base=master
  • label=ready to merge
  • status-success=build
  • -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]

Rule: Automatically merge PRs from maintainers on CI success and review (label)

  • author=@oss-approvers
  • base=master
  • label=ready to merge
  • status-success=build

Rule: Automatically merge autobump PRs on CI success (queue)

  • author:spinnakerbot
  • base~=^(master|release-)
  • label~=autobump-*
  • status-success=build
  • -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]

Rule: Automatically merge autobump PRs on CI success (label)

  • author:spinnakerbot
  • base~=^(master|release-)
  • label~=autobump-*
  • status-success=build

Rule: Automatically merge on CI success and review (queue)

  • approved-reviews-by=@oss-approvers
  • base=master
  • label=ready to merge
  • status-success=build
  • -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]

Rule: Automatically merge on CI success and review (label)

  • approved-reviews-by=@oss-approvers
  • base=master
  • label=ready to merge
  • status-success=build

Rule: Automatically merge release branch changes on CI success and release manager review (queue)

  • approved-reviews-by=@release-managers
  • base~=^release-
  • label=ready to merge
  • status-success=build
  • -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]

Rule: Automatically merge release branch changes on CI success and release manager review (label)

  • approved-reviews-by=@release-managers
  • base~=^release-
  • label=ready to merge
  • status-success=build

Rule: Request reviews for autobump PRs on CI failure (request_reviews)

  • base=master
  • base~=^(master|release-)
  • label~=autobump-*
  • status-failure=build
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

View more details on Mergify