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

Use Merge with AppendValues option when merging default config with hints generated config #36857

Merge branch 'main' into hints-autodiscover-merge-config-with-appendv…

d4387d8
Select commit
Loading
Failed to load commit list.
Merged

Use Merge with AppendValues option when merging default config with hints generated config #36857

Merge branch 'main' into hints-autodiscover-merge-config-with-appendv…
d4387d8
Select commit
Loading
Failed to load commit list.
Mergify / Summary succeeded Oct 24, 2023 in 3s

15 potential rules

⚠️ The pull request has been merged by @MichaelKatsoulis

Rule: self-assign PRs (assign)

  • #assignee=0
  • -closed
  • -merged

Rule: forward-port patches to main branch (backport)

  • label=forwardport-main
  • merged
  • merged [:pushpin: backport requirement]

Rule: ask to resolve conflict (comment)

  • -closed
  • -merged
  • conflict
  • -author=apmmachine

Rule: automatic squash and merge with success checks and the files matching the regex ^testing/environments/snapshot* are modified. (queue)

  • files~=^testing/environments/snapshot.*\.yml$
  • label=automation
  • #approved-reviews-by>=1
  • -draft [:pushpin: queue requirement]
  • -mergify-configuration-changed [:pushpin: queue -> allow_merging_configuration_change setting requirement]
  • check-success=beats-ci/pr-merge
  • any of: [:twisted_rightwards_arrows: queue conditions]
    • all of: [:pushpin: 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=CLA
        • check-neutral=CLA
        • check-skipped=CLA
      • any of: [🛡 GitHub branch protection]
        • check-success=beats-ci/pr-merge
        • check-neutral=beats-ci/pr-merge
        • check-skipped=beats-ci/pr-merge
      • any of: [🛡 GitHub branch protection]
        • check-success=Checks
        • check-neutral=Checks
        • check-skipped=Checks

Rule: notify the backport policy (comment)

  • -closed
  • -label~=^backport
  • -merged
  • base=main

Rule: backport patches to 7.17 branch (backport)

  • label=backport-v7.17.0
  • merged
  • merged [:pushpin: backport requirement]

Rule: backport patches to 8.3 branch (backport)

  • label=backport-v8.3.0
  • merged
  • merged [:pushpin: backport requirement]

Rule: backport patches to 8.4 branch (backport)

  • label=backport-v8.4.0
  • merged
  • merged [:pushpin: backport requirement]

Rule: backport patches to 8.5 branch (backport)

  • label=backport-v8.5.0
  • merged
  • merged [:pushpin: backport requirement]

Rule: backport patches to 8.6 branch (backport)

  • label=backport-v8.6.0
  • merged
  • merged [:pushpin: backport requirement]

Rule: backport patches to 8.7 branch (backport)

  • label=backport-v8.7.0
  • merged
  • merged [:pushpin: backport requirement]

Rule: backport patches to 8.8 branch (backport)

  • label=backport-v8.8.0
  • merged
  • merged [:pushpin: backport requirement]

Rule: backport patches to 8.9 branch (backport)

  • label=backport-v8.9.0
  • merged
  • merged [:pushpin: backport requirement]

Rule: backport patches to 8.10 branch (backport)

  • label=backport-v8.10.0
  • merged
  • merged [:pushpin: backport requirement]

Rule: backport patches to 8.11 branch (backport)

  • label=backport-v8.11.0
  • merged
  • merged [:pushpin: backport requirement]

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

🚀  You can help us by becoming a sponsor!


8 not applicable rules

Rule: close automated pull requests with bump updates if any conflict (close)

  • -closed
  • -merged
  • author=apmmachine
  • conflict
  • label=automation

Rule: automatic approval for automated pull requests with bump updates (review)

  • author=apmmachine
  • files~=^testing/environments/snapshot.*\.yml$
  • label=automation
  • check-success=beats-ci/pr-merge

Rule: delete upstream branch after merging changes on testing/environments/snapshot* or it's closed (delete_head_branch)

  • all of:
    • files~=^testing/environments/snapshot.*\.yml$
    • head~=^updatecli_bump-elastic-stack
    • label=automation
  • closed [:pushpin: delete_head_branch requirement]
  • any of:
    • closed
    • merged

Rule: delete upstream branch after merging changes on .go-version or it's closed (delete_head_branch)

  • all of:
    • files~=^\.go-version$
    • head~=^updatecli_bump-golang-version
    • label=automation
  • closed [:pushpin: delete_head_branch requirement]
  • any of:
    • closed
    • merged

Rule: automatic approval for mergify pull requests with changes in bump-rules (review)

  • author=mergify[bot]
  • files~=^\.mergify\.yml$
  • head~=^add-backport-next.*
  • label=automation
  • check-success=beats-ci/pr-merge

Rule: automatic squash and merge with success checks and the files matching the regex ^.mergify.yml is modified. (queue)

  • files~=^\.mergify\.yml$
  • head~=^add-backport-next.*
  • label=automation
  • #approved-reviews-by>=1
  • -draft [:pushpin: queue requirement]
  • -mergify-configuration-changed [:pushpin: queue -> allow_merging_configuration_change setting requirement]
  • check-success=beats-ci/pr-merge
  • any of: [:twisted_rightwards_arrows: queue conditions]
    • all of: [:pushpin: 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=CLA
        • check-neutral=CLA
        • check-skipped=CLA
      • any of: [🛡 GitHub branch protection]
        • check-success=beats-ci/pr-merge
        • check-neutral=beats-ci/pr-merge
        • check-skipped=beats-ci/pr-merge
      • any of: [🛡 GitHub branch protection]
        • check-success=Checks
        • check-neutral=Checks
        • check-skipped=Checks

Rule: delete upstream branch with changes on ^.mergify.yml that has been merged or closed (delete_head_branch)

  • all of:
    • files~=^\.mergify\.yml$
    • head~=^add-backport-next.*
    • label=automation
  • closed [:pushpin: delete_head_branch requirement]
  • any of:
    • closed
    • merged

Rule: notify the backport has not been merged yet (comment)

  • -closed
  • -merged
  • author=mergify[bot]
  • schedule=Mon-Mon 06:00-10:00[Europe/Paris]
  • #assignee>=1
  • #check-success>0
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