merge queue: embarking main (ecd4e1f) and #7437 together #7475
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
…or do format checks
Manual merge of both changes to zebra-chain/src/subtree.rs
github-actions
bot
added
C-trivial
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
✨ Unexpected queue change: the draft pull request #7475 has sustained unexpected changes from external sources. Due to an unexpected change in this draft PR, the pull request #7437 cannot be merged and will be re-embarked soon. ✨
Branch main (ecd4e1f) and #7437 are embarked together for merge.
This pull request has been created by Mergify to speculatively check the mergeability of #7437.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.
Required conditions of queue
urgentfor merge:check-neutral=Clippycheck-skipped=Clippycheck-success=Clippycheck-neutral=Test with fake activation heightscheck-skipped=Test with fake activation heightscheck-success=Test with fake activation heightscheck-neutral=Test allcheck-skipped=Test allcheck-success=Test allcheck-neutral=Install zebrad from lockfile without cache on ubuntu-latestcheck-skipped=Install zebrad from lockfile without cache on ubuntu-latestcheck-success=Install zebrad from lockfile without cache on ubuntu-latestcheck-neutral=Test checkpoint sync from empty statecheck-skipped=Test checkpoint sync from empty statecheck-success=Test checkpoint sync from empty statecheck-neutral=Zebra checkpoint update / Run sync-past-checkpoint testcheck-skipped=Zebra checkpoint update / Run sync-past-checkpoint testcheck-success=Zebra checkpoint update / Run sync-past-checkpoint testcheck-neutral=Zebra tip JSON-RPC / Run fully-synced-rpc testcheck-skipped=Zebra tip JSON-RPC / Run fully-synced-rpc testcheck-success=Zebra tip JSON-RPC / Run fully-synced-rpc testcheck-neutral=Build zebra-chain cratecheck-skipped=Build zebra-chain cratecheck-success=Build zebra-chain cratecheck-neutral=Build zebra-consensus cratecheck-skipped=Build zebra-consensus cratecheck-success=Build zebra-consensus cratecheck-neutral=Build zebra-network cratecheck-skipped=Build zebra-network cratecheck-success=Build zebra-network cratecheck-neutral=Build zebra-node-services cratecheck-skipped=Build zebra-node-services cratecheck-success=Build zebra-node-services cratecheck-neutral=Build zebra-rpc cratecheck-skipped=Build zebra-rpc cratecheck-success=Build zebra-rpc cratecheck-neutral=Build zebra-script cratecheck-skipped=Build zebra-script cratecheck-success=Build zebra-script cratecheck-neutral=Build zebra-state cratecheck-skipped=Build zebra-state cratecheck-success=Build zebra-state cratecheck-neutral=Build zebra-test cratecheck-skipped=Build zebra-test cratecheck-success=Build zebra-test cratecheck-neutral=Build zebra-utils cratecheck-skipped=Build zebra-utils cratecheck-success=Build zebra-utils cratecheck-neutral=Build zebrad cratecheck-skipped=Build zebrad cratecheck-success=Build zebrad cratecheck-neutral=Zebra tip update / Run update-to-tip testcheck-skipped=Zebra tip update / Run update-to-tip testcheck-success=Zebra tip update / Run update-to-tip testcheck-neutral=Test all with getblocktemplate-rpcs featurecheck-skipped=Test all with getblocktemplate-rpcs featurecheck-success=Test all with getblocktemplate-rpcs featurecheck-neutral=Test beta on ubuntu-latestcheck-skipped=Test beta on ubuntu-latestcheck-success=Test beta on ubuntu-latestcheck-neutral=Test stable on ubuntu-latestcheck-skipped=Test stable on ubuntu-latestcheck-success=Test stable on ubuntu-latestcheck-neutral=Build CI Docker / Build imagescheck-skipped=Build CI Docker / Build imagescheck-success=Build CI Docker / Build imagescheck-neutral=Test stable on ubuntu-latest --features getblocktemplate-rpcscheck-skipped=Test stable on ubuntu-latest --features getblocktemplate-rpcscheck-success=Test stable on ubuntu-latest --features getblocktemplate-rpcscheck-neutral=submit block / Run submit-block testcheck-skipped=submit block / Run submit-block testcheck-success=submit block / Run submit-block testcheck-neutral=get block template / Run get-block-template testcheck-skipped=get block template / Run get-block-template testcheck-success=get block template / Run get-block-template testcheck-neutral=Test Zebra custom Docker config filecheck-skipped=Test Zebra custom Docker config filecheck-success=Test Zebra custom Docker config filecheck-neutral=Test Zebra default Docker config filecheck-skipped=Test Zebra default Docker config filecheck-success=Test Zebra default Docker config filecheck-neutral=Generate checkpoints mainnet / Run generate-checkpoints-mainnet testcheck-skipped=Generate checkpoints mainnet / Run generate-checkpoints-mainnet testcheck-success=Generate checkpoints mainnet / Run generate-checkpoints-mainnet testcheck-neutral=Build tower-batch-control cratecheck-skipped=Build tower-batch-control cratecheck-success=Build tower-batch-control cratecheck-neutral=Test Zebra CD Docker config filecheck-skipped=Test Zebra CD Docker config filecheck-success=Test Zebra CD Docker config filecheck-neutral=Check crate release dry runcheck-skipped=Check crate release dry runcheck-success=Check crate release dry runcheck-neutral=Build CD Docker / Build imagescheck-skipped=Build CD Docker / Build imagescheck-success=Build CD Docker / Build imagescheck-neutral=Test integration with lightwalletdcheck-skipped=Test integration with lightwalletdcheck-success=Test integration with lightwalletdcheck-neutral=lightwalletd GRPC tests / Run lwd-grpc-wallet testcheck-skipped=lightwalletd GRPC tests / Run lwd-grpc-wallet testcheck-success=lightwalletd GRPC tests / Run lwd-grpc-wallet testcheck-neutral=lightwalletd tip send / Run lwd-send-transactions testcheck-skipped=lightwalletd tip send / Run lwd-send-transactions testcheck-success=lightwalletd tip send / Run lwd-send-transactions testcheck-neutral=lightwalletd tip update / Run lwd-update-sync testcheck-skipped=lightwalletd tip update / Run lwd-update-sync testcheck-success=lightwalletd tip update / Run lwd-update-sync test#approved-reviews-by>=1[🛡 GitHub branch protection]#changes-requested-reviews-by=0[🛡 GitHub branch protection]#review-threads-unresolved=0[🛡 GitHub branch protection]base=maincheck-success=Rustfmtcheck-neutral=Rustfmtcheck-skipped=Rustfmtcheck-success=mergefreezecheck-neutral=mergefreezecheck-skipped=mergefreezecheck-success=Check deny.toml banscheck-neutral=Check deny.toml banscheck-skipped=Check deny.toml banscheck-success=Check deny.toml bans --all-featurescheck-neutral=Check deny.toml bans --all-featurescheck-skipped=Check deny.toml bans --all-featurescheck-success=Check deny.toml sourcescheck-neutral=Check deny.toml sourcescheck-skipped=Check deny.toml sourcescheck-success=Check deny.toml sources --all-featurescheck-neutral=Check deny.toml sources --all-featurescheck-skipped=Check deny.toml sources --all-featurescheck-success=Check Cargo.lock is up to datecheck-neutral=Check Cargo.lock is up to datecheck-skipped=Check Cargo.lock is up to datecheck-success=Zebra checkpoint / Run sync-to-checkpoint testcheck-neutral=Zebra checkpoint / Run sync-to-checkpoint testcheck-skipped=Zebra checkpoint / Run sync-to-checkpoint testcheck-success=Build tower-fallback cratecheck-neutral=Build tower-fallback cratecheck-skipped=Build tower-fallback cratecheck-success=Zebra tip / Run full-sync-to-tip testcheck-neutral=Zebra tip / Run full-sync-to-tip testcheck-skipped=Zebra tip / Run full-sync-to-tip testcheck-success=Build lightwalletd Dockercheck-neutral=Build lightwalletd Dockercheck-skipped=Build lightwalletd Dockercheck-success=Check for unused dependenciescheck-neutral=Check for unused dependenciescheck-skipped=Check for unused dependenciescheck-success=Check if cached state disks exist for Mainnet / Check if cached state disks existcheck-neutral=Check if cached state disks exist for Mainnet / Check if cached state disks existcheck-skipped=Check if cached state disks exist for Mainnet / Check if cached state disks existcheck-success=Check crates matrixcheck-neutral=Check crates matrixcheck-skipped=Check crates matrixcheck-success=Generate crates matrixcheck-neutral=Generate crates matrixcheck-skipped=Generate crates matrixcheck-success=Check deny.toml bans --features default-release-binariescheck-neutral=Check deny.toml bans --features default-release-binariescheck-skipped=Check deny.toml bans --features default-release-binariescheck-success=Check deny.toml sources --features default-release-binariescheck-neutral=Check deny.toml sources --features default-release-binariescheck-skipped=Check deny.toml sources --features default-release-binariescheck-success=lightwalletd tip / Run lwd-full-sync testcheck-neutral=lightwalletd tip / Run lwd-full-sync testcheck-skipped=lightwalletd tip / Run lwd-full-sync testcheck-success=Build and Deploy Zebra Book Docscheck-neutral=Build and Deploy Zebra Book Docscheck-skipped=Build and Deploy Zebra Book Docscheck-success=Build and Deploy Zebra External Docscheck-neutral=Build and Deploy Zebra External Docscheck-skipped=Build and Deploy Zebra External Docscheck-success=Build and Deploy Zebra Internal Docscheck-neutral=Build and Deploy Zebra Internal Docscheck-skipped=Build and Deploy Zebra Internal DocsRequired conditions to stay in the queue:
Visit the Mergify Dashboard to check the state of the queue
urgent.More information about Mergify merge queue can be found in the documentation.
Mergify commands
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refreshwill re-evaluate the queue rulesAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com