Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

merge queue: embarking main (7597cf1) and #9091 together #9096

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 20, 2024

🎉 This pull request has been checked successfully and will be merged soon. 🎉

Branch main (7597cf1) and #9091 are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of #9091.
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]
  • 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 = 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 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 = 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 = 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 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 repository ruleset rule]:
    • 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 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-skipped = Build and Deploy Zebra Book Docs
    • check-neutral = Build and Deploy Zebra Book Docs
    • check-success = Build and Deploy Zebra Book Docs
  • any of [🛡 GitHub repository ruleset rule]:
    • check-skipped = Build and Deploy Zebra Internal Docs
    • check-neutral = Build and Deploy Zebra Internal Docs
    • check-success = 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
  • any of [🛡 GitHub repository ruleset rule]:
    • check-neutral = Mergify Merge Protections
    • check-skipped = Mergify Merge Protections
    • check-success = Mergify Merge Protections
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Integration tests / Zebra checkpoint update / Run sync-past-checkpoint test
    • check-neutral = Integration tests / Zebra checkpoint update / Run sync-past-checkpoint test
    • check-skipped = Integration tests / Zebra checkpoint update / Run sync-past-checkpoint test
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Integration tests / Zebra tip update / Run update-to-tip test
    • check-neutral = Integration tests / Zebra tip update / Run update-to-tip test
    • check-skipped = Integration tests / Zebra tip update / Run update-to-tip test
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Integration tests / Generate checkpoints mainnet / Run checkpoints-mainnet test
    • check-neutral = Integration tests / Generate checkpoints mainnet / Run checkpoints-mainnet test
    • check-skipped = Integration tests / Generate checkpoints mainnet / Run checkpoints-mainnet test
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Integration tests / submit block / Run submit-block test
    • check-neutral = Integration tests / submit block / Run submit-block test
    • check-skipped = Integration tests / submit block / Run submit-block test
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Integration tests / scan task commands / Run scan-task-commands test
    • check-neutral = Integration tests / scan task commands / Run scan-task-commands test
    • check-skipped = Integration tests / scan task commands / Run scan-task-commands test
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Integration tests / Generate checkpoints testnet / Run checkpoints-testnet test
    • check-neutral = Integration tests / Generate checkpoints testnet / Run checkpoints-testnet test
    • check-skipped = Integration tests / Generate checkpoints testnet / Run checkpoints-testnet test
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Integration tests / lightwalletd tip send / Run lwd-send-transactions test
    • check-neutral = Integration tests / lightwalletd tip send / Run lwd-send-transactions test
    • check-skipped = Integration tests / lightwalletd tip send / Run lwd-send-transactions test
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Integration tests / lightwalletd GRPC tests / Run lwd-grpc-wallet test
    • check-neutral = Integration tests / lightwalletd GRPC tests / Run lwd-grpc-wallet test
    • check-skipped = Integration tests / lightwalletd GRPC tests / Run lwd-grpc-wallet test
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Integration tests / lightwalletd tip update / Run lwd-update-sync test
    • check-neutral = Integration tests / lightwalletd tip update / Run lwd-update-sync test
    • check-skipped = Integration tests / lightwalletd tip update / Run lwd-update-sync test
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Unit tests / Test with fake activation heights
    • check-neutral = Unit tests / Test with fake activation heights
    • check-skipped = Unit tests / Test with fake activation heights
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Unit tests / Test all
    • check-neutral = Unit tests / Test all
    • check-skipped = Unit tests / Test all
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Unit tests / Test checkpoint sync from empty state
    • check-neutral = Unit tests / Test checkpoint sync from empty state
    • check-skipped = Unit tests / Test checkpoint sync from empty state
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Unit tests / Test integration with lightwalletd
    • check-neutral = Unit tests / Test integration with lightwalletd
    • check-skipped = Unit tests / Test integration with lightwalletd
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = mergefreeze
    • check-neutral = mergefreeze
    • check-skipped = mergefreeze

Required conditions to stay in the queue:

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

dependabot bot and others added 2 commits December 18, 2024 16:40
Bumps the devops group with 4 updates in the / directory: [codecov/codecov-action](https://github.com/codecov/codecov-action), [tj-actions/changed-files](https://github.com/tj-actions/changed-files), [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) and [docker/scout-action](https://github.com/docker/scout-action).


Updates `codecov/codecov-action` from 5.0.7 to 5.1.1
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](codecov/codecov-action@v5.0.7...v5.1.1)

Updates `tj-actions/changed-files` from 45.0.4 to 45.0.5
- [Release notes](https://github.com/tj-actions/changed-files/releases)
- [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md)
- [Commits](tj-actions/changed-files@v45.0.4...v45.0.5)

Updates `docker/setup-buildx-action` from 3.7.1 to 3.8.0
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](docker/setup-buildx-action@v3.7.1...v3.8.0)

Updates `docker/scout-action` from 1.15.1 to 1.16.1
- [Release notes](https://github.com/docker/scout-action/releases)
- [Commits](docker/scout-action@v1.15.1...v1.16.1)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: devops
- dependency-name: tj-actions/changed-files
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: devops
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: devops
- dependency-name: docker/scout-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: devops
...

Signed-off-by: dependabot[bot] <support@github.com>
@github-actions github-actions bot added the C-trivial Category: A trivial change that is not worth mentioning in the CHANGELOG label Dec 20, 2024
@mergify mergify bot closed this Dec 20, 2024
@mergify mergify bot deleted the mergify/merge-queue/46861e39e6 branch December 20, 2024 03:55
# for free to join this conversation on GitHub. Already have an account? # 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.

0 participants