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

ci(Mergify): enforce linear history #598

Merged
merged 2 commits into from
Dec 31, 2024

fix: backport labels

7a55c1e
Select commit
Loading
Failed to load commit list.
Merged

ci(Mergify): enforce linear history #598

fix: backport labels
7a55c1e
Select commit
Loading
Failed to load commit list.
Mergify / Summary succeeded Dec 31, 2024 in 1s

1 rule matches and 6 potential rules

⚠️ The pull request has been merged by @reaver-flomesh

Rule: Automatic squash and merge when CI passes and reviews approve (merge)

  • -closed [📌 merge requirement]
  • #approved-reviews-by >= 1
  • #approved-reviews-by >= 1 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
  • #commits-behind = 0 [🛡 GitHub branch protection]
  • #review-threads-unresolved = 0 [🛡 GitHub branch protection]
  • -conflict [📌 merge requirement]
  • -draft [📌 merge requirement]
  • -label=do-not-merge/hold
  • -label=wip
  • branch-protection-review-decision = APPROVED [🛡 GitHub branch protection]
  • check-success=Chart checks
  • check-success=Codegen
  • check-success=DCO
  • check-success=Go build
  • check-success=Go gateway test e2e (6)
  • check-success=Go gateway test e2e (v1.19.16, Test traffic from client to backend service routing by FSM Gateway...
  • check-success=Go gateway test e2e (v1.21.14, Test traffic from client to backend service routing by FSM Gateway...
  • check-success=Go gateway test e2e (v1.23.17, Test traffic from client to backend service routing by FSM Gateway...
  • check-success=Go ingress test e2e (7)
  • check-success=Go mesh test e2e (1)
  • check-success=Go mesh test e2e (2)
  • check-success=Go mesh test e2e (3)
  • check-success=Go mesh test e2e (4)
  • check-success=Go mesh test e2e (5)
  • check-success=Go mesh test e2e (v1.19.16, Test traffic flowing from client to server with a Kubernetes Service ...
  • check-success=Go mesh test e2e (v1.27.11, Test traffic flowing from client to server with a Kubernetes Service ...
  • check-success=Go retry test e2e (9)
  • check-success=Go statefulset test e2e (8)
  • check-success=Go test
  • check-success=Integration Test with Tresor, SMI traffic policies, and egress disabled
  • check-success=Lint
  • check-success=Mocks
  • check-success=Scan images for security vulnerabilities
  • check-success=Shellcheck
  • any of:
    • base=main
    • base~=^release\/v
  • any of:
    • all of:
      • label=ok-to-merge
      • label=squash
    • label=ok-to-squash
  • any of: [📌 merge -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success = Configuration changed
  • any of: [📌 merge requirement]
    • check-success = Mergify Merge Protections
    • check-neutral = Mergify Merge Protections
    • check-skipped = Mergify Merge Protections
  • any of: [🛡 GitHub branch protection]
    • check-success = Codegen
    • check-neutral = Codegen
    • check-skipped = Codegen
  • any of: [🛡 GitHub branch protection]
    • check-success = Shellcheck
    • check-neutral = Shellcheck
    • check-skipped = Shellcheck
  • any of: [🛡 GitHub branch protection]
    • check-success = Lint
    • check-neutral = Lint
    • check-skipped = Lint
  • any of: [🛡 GitHub branch protection]
    • check-success = Chart checks
    • check-neutral = Chart checks
    • check-skipped = Chart checks
  • any of: [🛡 GitHub branch protection]
    • check-success = Go build
    • check-neutral = Go build
    • check-skipped = Go build
  • any of: [🛡 GitHub branch protection]
    • check-success = DCO
    • check-neutral = DCO
    • check-skipped = DCO
  • any of: [🛡 GitHub branch protection]
    • check-success = Mergify Merge Protections
    • check-neutral = Mergify Merge Protections
    • check-skipped = Mergify Merge Protections

Rule: Rebase pull request when it's more than 3 commits behind main (rebase)

  • #commits-behind >= 3
  • -closed [📌 rebase requirement]
  • -conflict [📌 rebase requirement]
  • base = main
  • queue-position = -1 [📌 rebase requirement]
  • any of:
    • #commits > 1 [📌 rebase requirement]
    • #commits-behind > 0 [📌 rebase requirement]
    • -linear-history [📌 rebase requirement]

✅ Rule: Backport features/patches to the release/v1.4 branch (backport)

  • base=main
  • label = backport/v1.4
  • merged [📌 backport requirement]

Rule: Backport features/patches to the release/v1.3 branch (backport)

  • label = backport/v1.3
  • base=main
  • merged [📌 backport requirement]

Rule: Backport features/patches to the release/v1.2 branch (backport)

  • label = backport/v1.2
  • base=main
  • merged [📌 backport requirement]

Rule: Ping PR author when conflicting and Label conflicting pull requests (comment, label)

  • -closed
  • conflict

Rule: Comment when a pull request has unverified commits (comment)

  • #commits-unverified > 0
  • -closed

💖  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: Cherry-pick patches from release/v* to the main branch (backport)

  • base~=^release\/v
  • label = cherry-pick/main
  • merged [📌 backport requirement]
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