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

merge queue: embarking main (d28386c) and [#8024 + #8034] together #8035

Closed
wants to merge 11 commits into from
Closed

merge queue: embarking main (d28386c) and [#8024 + #8034] together #8035

wants to merge 11 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 29, 2023 •
edited
Loading

🎉 This combination of pull requests has been checked successfully and will be merged. 🎉

Branch main (d28386c) and [#8024 + #8034] are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of [#8024 + #8034].
You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue batched for merge:

  • #approved-reviews-by>=1 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by=0 [🛡 GitHub branch protection]
  • #review-threads-unresolved=0 [🛡 GitHub branch protection]
  • base=main
  • any of [🛡 GitHub branch protection]:
    • check-success=Rustfmt
    • check-neutral=Rustfmt
    • check-skipped=Rustfmt
  • any of [🛡 GitHub branch protection]:
    • check-success=mergefreeze
    • check-neutral=mergefreeze
    • check-skipped=mergefreeze
  • any of [🛡 GitHub branch protection]:
    • check-success=Clippy
    • check-neutral=Clippy
    • check-skipped=Clippy
  • any of [🛡 GitHub branch protection]:
    • check-success=Test with fake activation heights
    • check-neutral=Test with fake activation heights
    • check-skipped=Test with fake activation heights
  • any of [🛡 GitHub branch protection]:
    • check-success=Test all
    • check-neutral=Test all
    • check-skipped=Test all
  • any of [🛡 GitHub branch protection]:
    • check-success=Check deny.toml bans
    • check-neutral=Check deny.toml bans
    • check-skipped=Check deny.toml bans
  • any of [🛡 GitHub branch protection]:
    • check-success=Check deny.toml bans --all-features
    • check-neutral=Check deny.toml bans --all-features
    • check-skipped=Check deny.toml bans --all-features
  • any of [🛡 GitHub branch protection]:
    • check-success=Check deny.toml sources
    • check-neutral=Check deny.toml sources
    • check-skipped=Check deny.toml sources
  • any of [🛡 GitHub branch protection]:
    • check-success=Check deny.toml sources --all-features
    • check-neutral=Check deny.toml sources --all-features
    • check-skipped=Check deny.toml sources --all-features
  • any of [🛡 GitHub branch protection]:
    • check-success=Check Cargo.lock is up to date
    • check-neutral=Check Cargo.lock is up to date
    • check-skipped=Check Cargo.lock is up to date
  • any of [🛡 GitHub branch protection]:
    • check-success=Install zebrad from lockfile without cache on ubuntu-latest
    • check-neutral=Install zebrad from lockfile without cache on ubuntu-latest
    • check-skipped=Install zebrad from lockfile without cache on ubuntu-latest
  • any of [🛡 GitHub branch protection]:
    • check-success=Test checkpoint sync from empty state
    • check-neutral=Test checkpoint sync from empty state
    • check-skipped=Test checkpoint sync from empty state
  • any of [🛡 GitHub branch protection]:
    • check-success=Zebra checkpoint update / Run sync-past-checkpoint test
    • check-neutral=Zebra checkpoint update / Run sync-past-checkpoint test
    • check-skipped=Zebra checkpoint update / Run sync-past-checkpoint test
  • any of [🛡 GitHub branch protection]:
    • check-success=Zebra tip JSON-RPC / Run fully-synced-rpc test
    • check-neutral=Zebra tip JSON-RPC / Run fully-synced-rpc test
    • check-skipped=Zebra tip JSON-RPC / Run fully-synced-rpc test
  • any of [🛡 GitHub branch protection]:
    • check-success=Build tower-fallback crate
    • check-neutral=Build tower-fallback crate
    • check-skipped=Build tower-fallback crate
  • any of [🛡 GitHub branch protection]:
    • check-success=Build zebra-chain crate
    • check-neutral=Build zebra-chain crate
    • check-skipped=Build zebra-chain crate
  • any of [🛡 GitHub branch protection]:
    • check-success=Build zebra-consensus crate
    • check-neutral=Build zebra-consensus crate
    • check-skipped=Build zebra-consensus crate
  • any of [🛡 GitHub branch protection]:
    • check-success=Build zebra-network crate
    • check-neutral=Build zebra-network crate
    • check-skipped=Build zebra-network crate
  • any of [🛡 GitHub branch protection]:
    • check-success=Build zebra-node-services crate
    • check-neutral=Build zebra-node-services crate
    • check-skipped=Build zebra-node-services crate
  • any of [🛡 GitHub branch protection]:
    • check-success=Build zebra-rpc crate
    • check-neutral=Build zebra-rpc crate
    • check-skipped=Build zebra-rpc crate
  • any of [🛡 GitHub branch protection]:
    • check-success=Build zebra-script crate
    • check-neutral=Build zebra-script crate
    • check-skipped=Build zebra-script crate
  • any of [🛡 GitHub branch protection]:
    • check-success=Build zebra-state crate
    • check-neutral=Build zebra-state crate
    • check-skipped=Build zebra-state crate
  • any of [🛡 GitHub branch protection]:
    • check-success=Build zebra-test crate
    • check-neutral=Build zebra-test crate
    • check-skipped=Build zebra-test crate
  • any of [🛡 GitHub branch protection]:
    • check-success=Build zebra-utils crate
    • check-neutral=Build zebra-utils crate
    • check-skipped=Build zebra-utils crate
  • any of [🛡 GitHub branch protection]:
    • check-success=Build zebrad crate
    • check-neutral=Build zebrad crate
    • check-skipped=Build zebrad crate
  • any of [🛡 GitHub branch protection]:
    • check-success=Zebra tip update / Run update-to-tip test
    • check-neutral=Zebra tip update / Run update-to-tip test
    • check-skipped=Zebra tip update / Run update-to-tip test
  • any of [🛡 GitHub branch protection]:
    • check-success=Test beta on ubuntu-latest
    • check-neutral=Test beta on ubuntu-latest
    • check-skipped=Test beta on ubuntu-latest
  • any of [🛡 GitHub branch protection]:
    • check-success=Test stable on ubuntu-latest
    • check-neutral=Test stable on ubuntu-latest
    • check-skipped=Test stable on ubuntu-latest
  • any of [🛡 GitHub branch protection]:
    • check-success=Build CI Docker / Build images
    • check-neutral=Build CI Docker / Build images
    • check-skipped=Build CI Docker / Build images
  • any of [🛡 GitHub branch protection]:
    • check-success=Build lightwalletd Docker
    • check-neutral=Build lightwalletd Docker
    • check-skipped=Build lightwalletd Docker
  • any of [🛡 GitHub branch protection]:
    • check-success=submit block / Run submit-block test
    • check-neutral=submit block / Run submit-block test
    • check-skipped=submit block / Run submit-block test
  • any of [🛡 GitHub branch protection]:
    • check-success=get block template / Run get-block-template test
    • check-neutral=get block template / Run get-block-template test
    • check-skipped=get block template / Run get-block-template test
  • any of [🛡 GitHub branch protection]:
    • check-success=Check for unused dependencies
    • check-neutral=Check for unused dependencies
    • check-skipped=Check for unused dependencies
  • any of [🛡 GitHub branch protection]:
    • check-success=Check if cached state disks exist for Mainnet / Check if cached state disks exist
    • check-neutral=Check if cached state disks exist for Mainnet / Check if cached state disks exist
    • check-skipped=Check if cached state disks exist for Mainnet / Check if cached state disks exist
  • any of [🛡 GitHub branch protection]:
    • check-success=Check crates matrix
    • check-neutral=Check crates matrix
    • check-skipped=Check crates matrix
  • any of [🛡 GitHub branch protection]:
    • check-success=Generate crates matrix
    • check-neutral=Generate crates matrix
    • check-skipped=Generate crates matrix
  • any of [🛡 GitHub branch protection]:
    • check-success=Build tower-batch-control crate
    • check-neutral=Build tower-batch-control crate
    • check-skipped=Build tower-batch-control crate
  • any of [🛡 GitHub branch protection]:
    • check-success=Check deny.toml bans --features default-release-binaries
    • check-neutral=Check deny.toml bans --features default-release-binaries
    • check-skipped=Check deny.toml bans --features default-release-binaries
  • any of [🛡 GitHub branch protection]:
    • check-success=Check deny.toml sources --features default-release-binaries
    • check-neutral=Check deny.toml sources --features default-release-binaries
    • check-skipped=Check deny.toml sources --features default-release-binaries
  • any of [🛡 GitHub branch protection]:
    • check-success=Check crate release dry run
    • check-neutral=Check crate release dry run
    • check-skipped=Check crate release dry run
  • any of [🛡 GitHub branch protection]:
    • check-success=Build CD Docker / Build images
    • check-neutral=Build CD Docker / Build images
    • check-skipped=Build CD Docker / Build images
  • any of [🛡 GitHub branch protection]:
    • check-success=Test integration with lightwalletd
    • check-neutral=Test integration with lightwalletd
    • check-skipped=Test integration with lightwalletd
  • any of [🛡 GitHub branch protection]:
    • check-success=lightwalletd GRPC tests / Run lwd-grpc-wallet test
    • check-neutral=lightwalletd GRPC tests / Run lwd-grpc-wallet test
    • check-skipped=lightwalletd GRPC tests / Run lwd-grpc-wallet test
  • any of [🛡 GitHub branch protection]:
    • check-success=lightwalletd tip send / Run lwd-send-transactions test
    • check-neutral=lightwalletd tip send / Run lwd-send-transactions test
    • check-skipped=lightwalletd tip send / Run lwd-send-transactions test
  • any of [🛡 GitHub branch protection]:
    • check-success=Build and Deploy Zebra Book Docs
    • check-neutral=Build and Deploy Zebra Book Docs
    • check-skipped=Build and Deploy Zebra Book Docs
  • any of [🛡 GitHub branch protection]:
    • check-success=Build and Deploy Zebra Internal Docs
    • check-neutral=Build and Deploy Zebra Internal Docs
    • check-skipped=Build and Deploy Zebra Internal Docs
  • any of [🛡 GitHub branch protection]:
    • check-success=lightwalletd tip update / Run lwd-update-sync test
    • check-neutral=lightwalletd tip update / Run lwd-update-sync test
    • check-skipped=lightwalletd tip update / Run lwd-update-sync test
  • any of [🛡 GitHub branch protection]:
    • check-success=Generate checkpoints mainnet / Run checkpoints-mainnet test
    • check-neutral=Generate checkpoints mainnet / Run checkpoints-mainnet test
    • check-skipped=Generate checkpoints mainnet / Run checkpoints-mainnet test
  • any of [🛡 GitHub branch protection]:
    • check-success=Test CD custom Docker config file / Test custom-conf in Docker
    • check-neutral=Test CD custom Docker config file / Test custom-conf in Docker
    • check-skipped=Test CD custom Docker config file / Test custom-conf in Docker
  • any of [🛡 GitHub branch protection]:
    • check-success=Test CD default Docker config file / Test default-conf in Docker
    • check-neutral=Test CD default Docker config file / Test default-conf in Docker
    • check-skipped=Test CD default Docker config file / Test default-conf in Docker
  • any of [🛡 GitHub branch protection]:
    • check-success=Test CI custom Docker config file / Test custom-conf in Docker
    • check-neutral=Test CI custom Docker config file / Test custom-conf in Docker
    • check-skipped=Test CI custom Docker config file / Test custom-conf in Docker
  • any of [🛡 GitHub branch protection]:
    • check-success=Test CI default Docker config file / Test default-conf in Docker
    • check-neutral=Test CI default Docker config file / Test default-conf in Docker
    • check-skipped=Test CI default Docker config file / Test default-conf in Docker
  • any of [🛡 GitHub branch protection]:
    • check-success=Test stable on macos-latest
    • check-neutral=Test stable on macos-latest
    • check-skipped=Test stable on macos-latest
  • any of [🛡 GitHub branch protection]:
    • check-success=Build zebra-scan crate
    • check-neutral=Build zebra-scan crate
    • check-skipped=Build zebra-scan crate

Required conditions to stay in the queue:

Visit the Mergify Dashboard to check the state of the queue batched.

---
previous_failed_batches: []
pull_requests:
  - number: 8024
  - number: 8034
...

@github-actions github-actions bot added the C-trivial Category: A trivial change that is not worth mentioning in the CHANGELOG label Nov 29, 2023
@mergify mergify bot closed this Nov 30, 2023
@mergify mergify bot deleted the mergify/merge-queue/772dacf69e branch November 30, 2023 00:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
C-trivial Category: A trivial change that is not worth mentioning in the CHANGELOG
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@teor2345 @oxarbitrage