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

merge queue: embarking main (46c6b6e) and #8958 together #8962

Closed
wants to merge 5 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 23, 2024

✨ Pull request #8958 which was ahead in the queue has been dequeued. ✨

Branch main (46c6b6e) and #8958 are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of #8958.
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]
  • #approved-reviews-by >= 1 [🛡 GitHub repository ruleset rule]
  • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by = 0 [🛡 GitHub repository ruleset rule]
  • #review-threads-unresolved = 0 [🛡 GitHub repository ruleset rule]
  • base=main
  • 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-skipped = 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-success = Test CD custom Docker config file / Test custom-conf in Docker
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Rustfmt
    • check-neutral = Rustfmt
    • check-skipped = Rustfmt
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = mergefreeze
    • check-neutral = mergefreeze
    • check-skipped = mergefreeze
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Clippy
    • check-neutral = Clippy
    • check-skipped = Clippy
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Test with fake activation heights
    • check-neutral = Test with fake activation heights
    • check-skipped = Test with fake activation heights
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Test all
    • check-neutral = Test all
    • check-skipped = Test all
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Check deny.toml bans
    • check-neutral = Check deny.toml bans
    • check-skipped = Check deny.toml bans
  • any of [🛡 GitHub repository ruleset rule]:
    • 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 repository ruleset rule]:
    • 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 repository ruleset rule]:
    • check-success = Check deny.toml sources
    • check-neutral = Check deny.toml sources
    • check-skipped = Check deny.toml sources
  • any of [🛡 GitHub repository ruleset rule]:
    • 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 repository ruleset rule]:
    • 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 repository ruleset rule]:
    • 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 repository ruleset rule]:
    • 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 repository ruleset rule]:
    • 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 repository ruleset rule]:
    • 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 repository ruleset rule]:
    • 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 repository ruleset rule]:
    • check-success = Build tower-batch-control crate
    • check-neutral = Build tower-batch-control crate
    • check-skipped = Build tower-batch-control crate
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Build zebra-chain crate
    • check-neutral = Build zebra-chain crate
    • check-skipped = Build zebra-chain crate
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Build zebra-consensus crate
    • check-neutral = Build zebra-consensus crate
    • check-skipped = Build zebra-consensus crate
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Build zebra-grpc crate
    • check-neutral = Build zebra-grpc crate
    • check-skipped = Build zebra-grpc crate
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Build zebra-network crate
    • check-neutral = Build zebra-network crate
    • check-skipped = Build zebra-network crate
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Build zebra-node-services crate
    • check-neutral = Build zebra-node-services crate
    • check-skipped = Build zebra-node-services crate
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Build zebra-rpc crate
    • check-neutral = Build zebra-rpc crate
    • check-skipped = Build zebra-rpc crate
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Build zebra-scan crate
    • check-neutral = Build zebra-scan crate
    • check-skipped = Build zebra-scan crate
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Build zebra-script crate
    • check-neutral = Build zebra-script crate
    • check-skipped = Build zebra-script crate
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Build tower-fallback crate
    • check-neutral = Build tower-fallback crate
    • check-skipped = Build tower-fallback crate
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Build zebra-state crate
    • check-neutral = Build zebra-state crate
    • check-skipped = Build zebra-state crate
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Build zebra-test crate
    • check-neutral = Build zebra-test crate
    • check-skipped = Build zebra-test crate
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Build zebra-utils crate
    • check-neutral = Build zebra-utils crate
    • check-skipped = Build zebra-utils crate
  • any of [🛡 GitHub repository ruleset rule]:
    • 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 repository ruleset rule]:
    • check-success = Test beta on ubuntu-latest
    • check-neutral = Test beta on ubuntu-latest
    • check-skipped = Test beta on ubuntu-latest
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Test stable on ubuntu-latest
    • check-neutral = Test stable on ubuntu-latest
    • check-skipped = Test stable on ubuntu-latest
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Build CI Docker / Build images
    • check-neutral = Build CI Docker / Build images
    • check-skipped = Build CI Docker / Build images
  • any of [🛡 GitHub repository ruleset rule]:
    • 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 repository ruleset rule]:
    • 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 repository ruleset rule]:
    • 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 repository ruleset rule]:
    • check-success = Test integration with lightwalletd
    • check-neutral = Test integration with lightwalletd
    • check-skipped = Test integration with lightwalletd
  • any of [🛡 GitHub repository ruleset rule]:
    • 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 repository ruleset rule]:
    • 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 repository ruleset rule]:
    • 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 repository ruleset rule]:
    • check-skipped = 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-success = Test CD custom Docker config file / Test custom-conf in Docker
  • any of [🛡 GitHub repository ruleset rule]:
    • check-skipped = 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-success = Test CD default Docker config file / Test default-conf in Docker
  • any of [🛡 GitHub repository ruleset rule]:
    • 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 repository ruleset rule]:
    • 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 repository ruleset rule]:
    • check-success = Test stable on macos-latest
    • check-neutral = Test stable on macos-latest
    • check-skipped = Test stable on macos-latest
  • any of [🛡 GitHub repository ruleset rule]:
    • 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 repository ruleset rule]:
    • 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 repository ruleset rule]:
    • check-success = Check crate release dry run
    • check-neutral = Check crate release dry run
    • check-skipped = Check crate release dry run

Required conditions to stay in the queue:

---
previous_failed_batches: []
pull_requests:
  - number: 8958
...

dependabot bot and others added 5 commits October 22, 2024 09:57
Bumps the prod group with 15 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [clap](https://github.com/clap-rs/clap) | `4.5.18` | `4.5.20` |
| [indexmap](https://github.com/indexmap-rs/indexmap) | `2.5.0` | `2.6.0` |
| [serde](https://github.com/serde-rs/serde) | `1.0.210` | `1.0.211` |
| [futures](https://github.com/rust-lang/futures-rs) | `0.3.30` | `0.3.31` |
| [tokio](https://github.com/tokio-rs/tokio) | `1.40.0` | `1.41.0` |
| [tower](https://github.com/tower-rs/tower) | `0.4.13` | `0.5.1` |
| [pin-project](https://github.com/taiki-e/pin-project) | `1.1.5` | `1.1.6` |
| [metrics](https://github.com/metrics-rs/metrics) | `0.23.0` | `0.24.0` |
| [hyper](https://github.com/hyperium/hyper) | `1.4.1` | `1.5.0` |
| [bytes](https://github.com/tokio-rs/bytes) | `1.7.2` | `1.8.0` |
| [metrics-exporter-prometheus](https://github.com/metrics-rs/metrics) | `0.15.3` | `0.16.0` |
| [once_cell](https://github.com/matklad/once_cell) | `1.19.0` | `1.20.2` |
| [serde_json](https://github.com/serde-rs/json) | `1.0.128` | `1.0.132` |
| [primitive-types](https://github.com/paritytech/parity-common) | `0.12.2` | `0.13.1` |
| [serde_with](https://github.com/jonasbb/serde_with) | `3.9.0` | `3.11.0` |



Updates `clap` from 4.5.18 to 4.5.20
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](clap-rs/clap@clap_complete-v4.5.18...clap_complete-v4.5.20)

Updates `indexmap` from 2.5.0 to 2.6.0
- [Changelog](https://github.com/indexmap-rs/indexmap/blob/master/RELEASES.md)
- [Commits](indexmap-rs/indexmap@2.5.0...2.6.0)

Updates `serde` from 1.0.210 to 1.0.211
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](serde-rs/serde@v1.0.210...v1.0.211)

Updates `futures` from 0.3.30 to 0.3.31
- [Release notes](https://github.com/rust-lang/futures-rs/releases)
- [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md)
- [Commits](rust-lang/futures-rs@0.3.30...0.3.31)

Updates `tokio` from 1.40.0 to 1.41.0
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](tokio-rs/tokio@tokio-1.40.0...tokio-1.41.0)

Updates `tower` from 0.4.13 to 0.5.1
- [Release notes](https://github.com/tower-rs/tower/releases)
- [Commits](tower-rs/tower@tower-0.4.13...tower-0.5.1)

Updates `pin-project` from 1.1.5 to 1.1.6
- [Release notes](https://github.com/taiki-e/pin-project/releases)
- [Changelog](https://github.com/taiki-e/pin-project/blob/main/CHANGELOG.md)
- [Commits](taiki-e/pin-project@v1.1.5...v1.1.6)

Updates `metrics` from 0.23.0 to 0.24.0
- [Changelog](https://github.com/metrics-rs/metrics/blob/main/release.toml)
- [Commits](metrics-rs/metrics@metrics-v0.23.0...metrics-v0.24.0)

Updates `hyper` from 1.4.1 to 1.5.0
- [Release notes](https://github.com/hyperium/hyper/releases)
- [Changelog](https://github.com/hyperium/hyper/blob/master/CHANGELOG.md)
- [Commits](hyperium/hyper@v1.4.1...v1.5.0)

Updates `bytes` from 1.7.2 to 1.8.0
- [Release notes](https://github.com/tokio-rs/bytes/releases)
- [Changelog](https://github.com/tokio-rs/bytes/blob/master/CHANGELOG.md)
- [Commits](tokio-rs/bytes@v1.7.2...v1.8.0)

Updates `metrics-exporter-prometheus` from 0.15.3 to 0.16.0
- [Changelog](https://github.com/metrics-rs/metrics/blob/main/release.toml)
- [Commits](metrics-rs/metrics@metrics-exporter-prometheus-v0.15.3...metrics-exporter-prometheus-v0.16.0)

Updates `once_cell` from 1.19.0 to 1.20.2
- [Changelog](https://github.com/matklad/once_cell/blob/master/CHANGELOG.md)
- [Commits](matklad/once_cell@v1.19.0...v1.20.2)

Updates `serde_json` from 1.0.128 to 1.0.132
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](serde-rs/json@1.0.128...1.0.132)

Updates `primitive-types` from 0.12.2 to 0.13.1
- [Commits](https://github.com/paritytech/parity-common/commits/primitive-types-v0.13.1)

Updates `serde_with` from 3.9.0 to 3.11.0
- [Release notes](https://github.com/jonasbb/serde_with/releases)
- [Commits](jonasbb/serde_with@v3.9.0...v3.11.0)

Updates `futures-util` from 0.3.30 to 0.3.31
- [Release notes](https://github.com/rust-lang/futures-rs/releases)
- [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md)
- [Commits](rust-lang/futures-rs@0.3.30...0.3.31)

Updates `syn` from 2.0.79 to 2.0.82
- [Release notes](https://github.com/dtolnay/syn/releases)
- [Commits](dtolnay/syn@2.0.79...2.0.82)

Updates `futures-core` from 0.3.30 to 0.3.31
- [Release notes](https://github.com/rust-lang/futures-rs/releases)
- [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md)
- [Commits](rust-lang/futures-rs@0.3.30...0.3.31)

---
updated-dependencies:
- dependency-name: clap
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod
- dependency-name: indexmap
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: prod
- dependency-name: serde
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod
- dependency-name: futures
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod
- dependency-name: tokio
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: prod
- dependency-name: tower
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: prod
- dependency-name: pin-project
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod
- dependency-name: metrics
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: prod
- dependency-name: hyper
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: prod
- dependency-name: bytes
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: prod
- dependency-name: metrics-exporter-prometheus
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: prod
- dependency-name: once_cell
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: prod
- dependency-name: serde_json
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod
- dependency-name: primitive-types
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: prod
- dependency-name: serde_with
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: prod
- dependency-name: futures-util
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod
- dependency-name: syn
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod
- dependency-name: futures-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod
...

Signed-off-by: dependabot[bot] <[email protected]>
@github-actions github-actions bot added the C-trivial Category: A trivial change that is not worth mentioning in the CHANGELOG label Oct 23, 2024
@mergify mergify bot closed this Oct 23, 2024
@mergify mergify bot deleted the mergify/merge-queue/55b19e0fc1 branch October 23, 2024 14:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-trivial Category: A trivial change that is not worth mentioning in the CHANGELOG
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant