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

[8.17](backport #4182) Redact static tokens and custom http headers #4191

Merged
merged 2 commits into from
Dec 10, 2024

Fix merge conflict

dd26c5f
Select commit
Loading
Failed to load commit list.
Merged

[8.17](backport #4182) Redact static tokens and custom http headers #4191

Fix merge conflict
dd26c5f
Select commit
Loading
Failed to load commit list.
Mergify / Summary succeeded Dec 16, 2024 in 2s

20 potential rules

⚠️ The pull request has been merged by @michel-laterman

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

  • label=forwardport-main
  • merged
  • merged [📌 backport requirement]

Rule: ask to resolve conflict (comment)

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

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

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

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

  • -closed [📌 queue requirement]
  • check-success=fleet-server/pr-merge
  • -conflict [📌 queue requirement]
  • -draft [📌 queue requirement]
  • author=mergify[bot]
  • base~=^(7|8)\.
  • check-success=CLA
  • label=backport
  • any of: [📌 queue -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success = Configuration changed
  • any of: [🔀 queue conditions]
    • all of: [📌 queue conditions of queue default]
      • #approved-reviews-by >= 1 [🛡 GitHub branch protection]
      • #approved-reviews-by >= 1 [🛡 GitHub repository ruleset rule]
      • #approved-reviews-by >= 1 [🛡 GitHub repository ruleset rule]
      • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
      • #changes-requested-reviews-by = 0 [🛡 GitHub repository ruleset rule]
      • #changes-requested-reviews-by = 0 [🛡 GitHub repository ruleset rule]
      • 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 = buildkite/fleet-server
        • check-neutral = buildkite/fleet-server
        • check-skipped = buildkite/fleet-server

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

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

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

  • -closed [📌 queue requirement]
  • check-success=fleet-server/pr-merge
  • files~=^dev-tools/integration/.env$
  • label=automation
  • -conflict [📌 queue requirement]
  • -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]
      • #approved-reviews-by >= 1 [🛡 GitHub branch protection]
      • #approved-reviews-by >= 1 [🛡 GitHub repository ruleset rule]
      • #approved-reviews-by >= 1 [🛡 GitHub repository ruleset rule]
      • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
      • #changes-requested-reviews-by = 0 [🛡 GitHub repository ruleset rule]
      • #changes-requested-reviews-by = 0 [🛡 GitHub repository ruleset rule]
      • 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 = buildkite/fleet-server
        • check-neutral = buildkite/fleet-server
        • check-skipped = buildkite/fleet-server

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

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

Rule: backport patches to 8.6 branch (backport)

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

Rule: backport patches to 8.7 branch (backport)

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

Rule: backport patches to 8.8 branch (backport)

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

Rule: backport patches to 8.9 branch (backport)

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

Rule: backport patches to 8.10 branch (backport)

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

Rule: backport patches to 8.11 branch (backport)

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

Rule: backport patches to 8.12 branch (backport)

  • label=backport-v8.12.0
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.13 branch (backport)

  • label=backport-v8.13.0
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.14 branch (backport)

  • label=backport-v8.14.0
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.15 branch (backport)

  • label~=^(backport-v8.15.0|backport-8.15)$
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.16 branch (backport)

  • label~=^(backport-v8.16.0|backport-8.16)$
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.x branch (backport)

  • label~=^(backport-v8.x|backport-8.x)$
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.17 branch (backport)

  • label=backport-8.17
  • merged
  • merged [📌 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: 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 [📌 delete_head_branch requirement]
  • any of:
    • closed
    • merged

Rule: backport patches to 7.17 branch (backport)

  • base=main
  • label~=^(backport-v7.17.0|backport-7.17)$
  • merged
  • merged [📌 backport requirement]

Rule: notify the backport policy (comment)

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

Rule: add backport-8.x label for main only if no skipped or assigned already (comment, label)

  • -closed
  • -merged
  • base=main
  • -label~=^(backport-skip|backport-8.x)$
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