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

Jump to bottom

Security Agent integration updates #1233

Open
wants to merge 36 commits into
base: test-k2-integration
Choose a base branch
from

Merge branch 'apm-main' into test-k2-integration

ca62f46
Select commit
Loading
Failed to load commit list.
Open

Security Agent integration updates #1233

Merge branch 'apm-main' into test-k2-integration
ca62f46
Select commit
Loading
Failed to load commit list.
Mergify / Summary succeeded Oct 24, 2024 in 5s

2 rules match and 4 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 September 16th, 2024.
This option will be removed on October 21st, 2024.
For more information: https://docs.mergify.com/configuration/file-format/#queue-rules

Rule: Automatic PR branch updates (update)

  • -conflict [📌 update requirement]
  • #commits-behind > 0 [📌 update requirement]
  • -closed [📌 update requirement]
  • -draft
  • -merged
  • queue-position = -1 [📌 update requirement]
  • queue-position=-1

Rule: Clean up after merge (delete_head_branch)

  • closed [📌 delete_head_branch requirement]
  • merged

Rule: Clean up after merge (label)

  • merged

✅ Rule: Toggle label on merge conflicts (label)

  • -merged
  • conflict

✅ Rule: Add label on test failures (label)

  • -merged
  • any of:
    • check-skipped=tests
    • check-failure=tests

Rule: Remove label on test success (label)

  • check-success=tests
  • -merged
💖  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: Regular PRs - Add to merge queue on approval (squash) (queue)

  • -conflict [📌 queue requirement]
  • all of:
    • #approved-reviews-by>=1
    • check-success=tests
    • label=ready-to-merge
    • any of:
      • base=main
      • base~=^develop
    • -draft
    • -merged
  • -closed [📌 queue requirement]
  • -draft [📌 queue requirement]
  • -head~=^develop
  • any of: [📌 queue -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success = Configuration changed
  • any of: [🔀 queue conditions]
    • all of [📌 queue conditions of queue default]
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