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

blockstore: only consume duplicate proofs from root_slot + 1 on startup #1971

Merged
merged 3 commits into from
Jul 12, 2024

pr feedback: add pub behind dcou for test fns

14f79b6
Select commit
Loading
Failed to load commit list.
Merged

blockstore: only consume duplicate proofs from root_slot + 1 on startup #1971

pr feedback: add pub behind dcou for test fns
14f79b6
Select commit
Loading
Failed to load commit list.
Mergify / Summary succeeded Jul 12, 2024 in 2s

4 rules match and 5 potential rules

⚠️ The pull request has been merged by @AshwinSekar

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

  • -closed [📌 merge requirement]
  • all of:
    • label=automerge
    • label!=no-automerge
    • status-success=buildkite/agave
    • status-success=ci-gate
    • any of:
      • -files~=^docs/
      • status-success=build & deploy docs
    • any of:
      • any of:
        • check-success=clippy-nightly (macos-latest)
        • check-success=clippy-nightly (macos-latest-large)
      • -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-sbf|cargo-test-sbf|ci/downstream-projects/run-spl\.sh|\.github/workflows/downstream-project-spl\.yml)$
  • #approved-reviews-by>=1 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by=0 [🛡 GitHub branch protection]
  • -conflict [📌 merge requirement]
  • -draft [📌 merge requirement]
  • 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.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

Rule: v2.0 feature-gate backport (backport)

  • label=feature-gate
  • label=v2.0
  • merged [📌 backport requirement]

✅ Rule: v2.0 non-feature-gate backport (backport)

  • label!=feature-gate
  • label=v2.0
  • merged [📌 backport requirement]

✅ Rule: v2.0 backport warning comment (comment)

  • label=v2.0

Rule: Reminder to update RPC clients for changes in rpc/ (comment)

  • any of:
    • files~=^rpc-client-api/src/.*\.rs$
    • files~=^rpc/src/rpc\.rs$
    • files~=^rpc/src/rpc_pubsub\.rs$

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