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 (522d955) and #9003 together #9130

Closed
wants to merge 7 commits into from
Closed

merge queue: embarking main (522d955) and #9003 together #9130

wants to merge 7 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 16, 2025 •
edited
Loading

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

Branch main (522d955) and #9003 are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of #9003.
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-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 = 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 = 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 = 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-neutral = Mergify Merge Protections
    • check-skipped = Mergify Merge Protections
    • check-success = Mergify Merge Protections
  • any of [🛡 GitHub repository ruleset rule]:
    • check-skipped = Build CD Docker / Build images
    • check-neutral = Build CD Docker / Build images
    • check-success = Build CD Docker / Build images
  • 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 = Integration tests / Check if cached state disks exist for Mainnet / Get Mainnet cached disk
    • check-neutral = Integration tests / Check if cached state disks exist for Mainnet / Get Mainnet cached disk
    • check-skipped = Integration tests / Check if cached state disks exist for Mainnet / Get Mainnet cached disk
  • 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 / Zebra tip JSON-RPC / Run fully-synced-rpc test
    • check-neutral = Integration tests / Zebra tip JSON-RPC / Run fully-synced-rpc test
    • check-skipped = Integration tests / Zebra tip JSON-RPC / Run fully-synced-rpc 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 / get block template / Run get-block-template test
    • check-neutral = Integration tests / get block template / Run get-block-template test
    • check-skipped = Integration tests / get block template / Run get-block-template 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 / 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 = 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 = 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 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 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 = Unit tests / Test CI default Docker config file / Test default-conf in Docker
    • check-neutral = Unit tests / Test CI default Docker config file / Test default-conf in Docker
    • check-skipped = Unit tests / Test CI default Docker config file / Test default-conf in Docker
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Unit tests / Test CI testnet Docker config file / Test testnet-conf in Docker
    • check-neutral = Unit tests / Test CI testnet Docker config file / Test testnet-conf in Docker
    • check-skipped = Unit tests / Test CI testnet Docker config file / Test testnet-conf in Docker
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Unit tests / Test CI custom Docker config file / Test custom-conf in Docker
    • check-neutral = Unit tests / Test CI custom Docker config file / Test custom-conf in Docker
    • check-skipped = Unit tests / Test CI 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-skipped = Test CD testnet Docker config file / Test testnet-conf in Docker
    • check-neutral = Test CD testnet Docker config file / Test testnet-conf in Docker
    • check-success = Test CD testnet Docker config file / Test testnet-conf in Docker
  • 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 = Get disk name / Get Mainnet cached disk
    • check-neutral = Get disk name / Get Mainnet cached disk
    • check-success = Get disk name / Get Mainnet cached disk
  • 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: 9003
...

gustavovalverde and others added 7 commits December 26, 2024 08:07
@gustavovalverde
feat(actions): use GitHub environments for infra deployments
a68430f
@gustavovalverde
chore(workflows): enhance environment handling in CI/CD configurations
ac02227 
- Added dynamic environment assignment in `cd-deploy-nodes-gcp.yml` based on event type (release or dev).
- Updated `sub-build-docker-image.yml` to utilize the `inputs.environment` for environment configuration.
- Introduced a strategy matrix for environment selection in `sub-deploy-integration-tests-gcp.yml`, allowing for both dev and prod environments based on the branch.
- Ensured `sub-find-cached-disks.yml` uses the `inputs.environment` for consistency across workflows.
@gustavovalverde
fix(workflows): streamline environment input handling in CI configura…
2d187bd 
…tions

- Removed the required environment input from `sub-ci-integration-tests-gcp.yml`.
- Updated comments in `sub-deploy-integration-tests-gcp.yml` to clarify the strategy for creating images in dev and prod environments based on the main branch.
@gustavovalverde
test: just set the environmet when diff to dev
72c26e6
@gustavovalverde
refactor(workflows): unify environment handling across CI configurations
25f4b10 
- Removed the optional environment input from multiple workflow files, including `manual-zcashd-deploy.yml`, `sub-build-docker-image.yml`, and `sub-deploy-integration-tests-gcp.yml`.
- Updated environment assignment logic to consistently use 'prod' for release events across `cd-deploy-nodes-gcp.yml`, `sub-build-docker-image.yml`, `sub-find-cached-disks.yml`, and `sub-deploy-integration-tests-gcp.yml`.
- Enhanced clarity in comments regarding environment strategies in `sub-deploy-integration-tests-gcp.yml`.
@gustavovalverde
fix(workflows): update environment assignment logic for CI configurat…
83a2e34 
…ions

- Changed environment assignment in `cd-deploy-nodes-gcp.yml`, `sub-build-docker-image.yml`, and `sub-find-cached-disks.yml` to use 'dev' as a fallback when the event is not a release, to avoid a `false` fallback
@mergify
Merge of #9003
ef58c0d
@github-actions github-actions bot added the C-trivial Category: A trivial change that is not worth mentioning in the CHANGELOG label Jan 16, 2025
@mergify mergify bot closed this Jan 16, 2025
@mergify mergify bot deleted the mergify/merge-queue/ae8e5d82f4 branch January 16, 2025 01:37
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.
1 participant
@gustavovalverde