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

fix merge error #34195

Merged
merged 1 commit into from
Nov 21, 2023

fix merge error

8c9ba8b
Select commit
Loading
Failed to load commit list.
Merged

fix merge error #34195

fix merge error
8c9ba8b
Select commit
Loading
Failed to load commit list.
Mergify / Summary succeeded Nov 21, 2023 in 3s

1 rule matches and 7 potential rules

Rule: automatic merge (squash) on CI success (merge)

  • #approved-reviews-by>=1 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by=0 [🛡 GitHub branch protection]
  • -conflict [:pushpin: merge requirement]
  • -draft [:pushpin: merge requirement]
  • -mergify-configuration-changed [:pushpin: merge -> allow_merging_configuration_change setting requirement]
  • all of:
    • label!=no-automerge
    • label=automerge
    • status-success=buildkite/solana
    • status-success=ci-gate
    • any of:
      • -files~=^docs/
      • status-success=build & deploy docs

Rule: remove automerge label on CI failure (label, comment)

  • all of:
    • #status-failure!=0
    • -merged
    • label=automerge

Rule: v1.16 feature-gate backport (backport)

  • label=feature-gate
  • label=v1.16
  • merged [:pushpin: backport requirement]

Rule: v1.16 non-feature-gate backport (backport)

  • label=v1.16
  • label!=feature-gate
  • merged [:pushpin: backport requirement]

Rule: v1.16 backport warning comment (comment)

  • label=v1.16

Rule: v1.17 feature-gate backport (backport)

  • label=feature-gate
  • label=v1.17
  • merged [:pushpin: backport requirement]

Rule: v1.17 non-feature-gate backport (backport)

  • label=v1.17
  • label!=feature-gate
  • merged [:pushpin: backport requirement]

Rule: v1.17 backport warning comment (comment)

  • label=v1.17
3 not applicable rules

Rule: label changes from community (label)

  • author≠@core-contributors
  • author≠@monorepo-write
  • author≠@monorepo-maintainers
  • author≠@monorepo-triage
  • author≠dependabot[bot]
  • author≠github-actions[bot]
  • author≠mergify[bot]

Rule: request review for community changes (request_reviews)

  • #approved-reviews-by=0
  • author≠@core-contributors
  • author≠@monorepo-write
  • #changes-requested-reviews-by=0
  • #commented-reviews-by=0
  • #review-requested=0
  • author≠@monorepo-maintainers
  • author≠@monorepo-triage
  • author≠dependabot[bot]
  • author≠github-actions[bot]
  • author≠mergify[bot]

Rule: label changes from monorepo-triage (label)

  • author=@monorepo-triage
  • author≠@core-contributors
  • author≠@monorepo-write
  • author≠@monorepo-maintainers
  • author≠dependabot[bot]
  • author≠github-actions[bot]
  • author≠mergify[bot]
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