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

blockstore: send duplicate proofs for chained merkle root conflicts #835

Merged
merged 4 commits into from
Apr 23, 2024

pr feedback: cow to simplify, avoid extra indentation

4c79fca
Select commit
Loading
Failed to load commit list.
Merged

blockstore: send duplicate proofs for chained merkle root conflicts #835

pr feedback: cow to simplify, avoid extra indentation
4c79fca
Select commit
Loading
Failed to load commit list.
Mergify / Summary succeeded Apr 23, 2024 in 2s

2 rules match and 6 potential rules

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

  • -closed [📌 merge requirement]
  • #approved-reviews-by>=1 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by=0 [🛡 GitHub branch protection]
  • -conflict [📌 merge requirement]
  • -draft [📌 merge requirement]
  • all of:
    • label!=no-automerge
    • label=automerge
    • status-success=buildkite/agave
    • status-success=ci-gate
    • any of:
      • -files~=^docs/
      • status-success=build & deploy docs
    • any of:
      • all of:
        • any of:
          • check-success=clippy-stable (macos-latest-large)
          • check-success=clippy-stable (macos-latest)
        • any of:
          • check-success=clippy-nightly (macos-latest-large)
          • check-success=clippy-nightly (macos-latest)
      • -files~=(\.rs|Cargo\.toml|Cargo\.lock|\.github/scripts/cargo-clippy-before-script\.sh|\.github/workflows/cargo\.yml)$
    • any of:
      • all of:
        • status-success=cargo-test-sbf (associated-token-account/program, associated-token-account/program-test)
        • status-success=cargo-test-sbf (feature-proposal/program)
        • status-success=cargo-test-sbf (governance/addin-mock/program, governance/program)
        • status-success=cargo-test-sbf (instruction-padding/program, token/program-2022, token/program-2022-test)
        • status-success=cargo-test-sbf (memo/program)
        • status-success=cargo-test-sbf (name-service/program)
        • status-success=cargo-test-sbf (single-pool/program)
        • status-success=cargo-test-sbf (stake-pool/program)
        • status-success=cargo-test-sbf (token-upgrade/program)
        • status-success=cargo-test-sbf (token/program)
      • -files~=(\.rs|Cargo\.toml|Cargo\.lock|cargo-build-bpf|cargo-test-bpf|cargo-build-sbf|cargo-test-sbf|ci/downstream-projects/run-spl\.sh|\.github/workflows/downstream-project-spl\.yml)$
  • any of: [📌 merge -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success=Configuration changed

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

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

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

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

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

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

Rule: v1.17 backport warning comment (comment)

  • label=v1.17

✅ Rule: v1.18 feature-gate backport (backport)

  • label=feature-gate
  • label=v1.18
  • merged [📌 backport requirement]

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

  • label!=feature-gate
  • label=v1.18
  • merged [📌 backport requirement]

✅ Rule: v1.18 backport warning comment (comment)

  • label=v1.18
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
  • #commented-reviews-by=0
  • author≠@core-contributors
  • author≠@monorepo-write
  • #changes-requested-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