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

File delivery #2666

Merged
merged 21 commits into from
Jun 9, 2023

Merge branch 'main' into file-delivery

89a5abf
Select commit
Failed to load commit list.
Merged

File delivery #2666

Merge branch 'main' into file-delivery
89a5abf
Select commit
Failed to load commit list.
Mergify / Summary succeeded Jun 9, 2023 in 2s

9 potential rules

⚠️ The pull request has been merged by @pzl

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: backport patches to 7.17 branch (backport)

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

Rule: remove backport-skip label (label)

  • label~=backport-v

Rule: automatic merge when CI passes and the file dev-tools/integration/.env is modified. (queue)

  • files~=^dev-tools/integration/.env$
  • label=automation
  • #approved-reviews-by>=1 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by=0 [🛡 GitHub branch protection]
  • -draft [:pushpin: queue requirement]
  • -mergify-configuration-changed [:pushpin: queue -> allow_merging_configuration_change setting requirement]
  • branch-protection-review-decision=APPROVED [🛡 GitHub branch protection]
  • check-success=fleet-server/pr-merge
  • any of: [🛡 GitHub branch protection]
    • check-success=fleet-server/pr-merge
    • check-neutral=fleet-server/pr-merge
    • check-skipped=fleet-server/pr-merge
  • any of: [🛡 GitHub branch protection]
    • check-success=CLA
    • check-neutral=CLA
    • check-skipped=CLA

Rule: automatic merge when CI passes and the file dev-tools/integration/.env is modified. (review)

  • files~=^dev-tools/integration/.env$
  • label=automation
  • check-success=fleet-server/pr-merge

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]
💖  Mergify is proud to provide this service for free to open source projects.

🚀  You can help us by becoming a sponsor!

5 not applicable rules

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

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

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

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

Rule: automatic merge for 7. or 8. branches when CI passes (queue)

  • author=mergify[bot]
  • base~=^(7|8)\.
  • label=backport
  • #approved-reviews-by>=1 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by=0 [🛡 GitHub branch protection]
  • -draft [:pushpin: queue requirement]
  • -mergify-configuration-changed [:pushpin: queue -> allow_merging_configuration_change setting requirement]
  • branch-protection-review-decision=APPROVED [🛡 GitHub branch protection]
  • check-success=CLA
  • check-success=fleet-server/pr-merge
  • any of: [🛡 GitHub branch protection]
    • check-success=fleet-server/pr-merge
    • check-neutral=fleet-server/pr-merge
    • check-skipped=fleet-server/pr-merge
  • any of: [🛡 GitHub branch protection]
    • check-success=CLA
    • check-neutral=CLA
    • check-skipped=CLA

Rule: automatic merge for 7. or 8. branches when CI passes (review)

  • author=mergify[bot]
  • base~=^(7|8)\.
  • label=backport
  • check-success=CLA
  • check-success=fleet-server/pr-merge

Rule: delete upstream branch with changes on dev-tools/integration/.env or .go-version after merging/closing it (delete_head_branch)

  • all of:
    • files~=^(dev-tools/integration/.env|.go-version)$
    • head~=^updatecli.*
    • label=automation
  • closed [:pushpin: delete_head_branch requirement]
  • any of:
    • closed
    • merged
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