From 76522b552cc1fa2bd3043506e8532d56ba6b1f40 Mon Sep 17 00:00:00 2001 From: teor Date: Wed, 8 Nov 2023 03:34:17 +1000 Subject: [PATCH 1/2] change(release): Only allow releases from the `main` branch, and update workflow names (#7917) * only allow releases from the main branch * Update workflow links in the release checklist * One more workflow query update --- .github/PULL_REQUEST_TEMPLATE/release-checklist.md | 8 +++++--- Cargo.toml | 7 +++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE/release-checklist.md b/.github/PULL_REQUEST_TEMPLATE/release-checklist.md index 48efec453f5..e25f0b64ce9 100644 --- a/.github/PULL_REQUEST_TEMPLATE/release-checklist.md +++ b/.github/PULL_REQUEST_TEMPLATE/release-checklist.md @@ -131,8 +131,10 @@ The end of support height is calculated from the current blockchain height: ## Test the Pre-Release -- [ ] Wait until the [Docker binaries have been built on `main`](https://github.com/ZcashFoundation/zebra/actions/workflows/continous-integration-docker.yml), and the quick tests have passed. -- [ ] Wait until the [pre-release deployment machines have successfully launched](https://github.com/ZcashFoundation/zebra/actions/workflows/continous-delivery.yml) +- [ ] Wait until the Docker binaries have been built on `main`, and the quick tests have passed: + - [ ] [ci-unit-tests-docker.yml](https://github.com/ZcashFoundation/zebra/actions/workflows/ci-unit-tests-docker.yml?query=branch%3Amain) + - [ ] [ci-integration-tests-gcp.yml](https://github.com/ZcashFoundation/zebra/actions/workflows/ci-integration-tests-gcp.yml?query=branch%3Amain) +- [ ] Wait until the [pre-release deployment machines have successfully launched](https://github.com/ZcashFoundation/zebra/actions/workflows/cd-deploy-nodes-gcp.yml?query=event%3Arelease) ## Publish Release @@ -148,7 +150,7 @@ The end of support height is calculated from the current blockchain height: and put the output in a comment on the PR. ## Publish Docker Images -- [ ] Wait for the [the Docker images to be published successfully](https://github.com/ZcashFoundation/zebra/actions/workflows/release-binaries.yml). +- [ ] Wait for the [the Docker images to be published successfully](https://github.com/ZcashFoundation/zebra/actions/workflows/release-binaries.yml?query=event%3Arelease). - [ ] Un-freeze the [`batched` queue](https://dashboard.mergify.com/github/ZcashFoundation/repo/zebra/queues) using Mergify. - [ ] Remove `do-not-merge` from the PRs you added it to diff --git a/Cargo.toml b/Cargo.toml index 2146e9b487f..d9589c4353f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,6 +17,13 @@ members = [ # Use the edition 2021 dependency resolver in the workspace, to match the crates resolver = "2" +# `cargo release` settings + +[workspace.metadata.release] + +# We always do releases from the main branch +allow-branch = ["main"] + # Compilation settings [profile.dev] From 2efc6bf4b2875f16a987bcbff0f90cff98eda3fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Nov 2023 19:30:58 +0000 Subject: [PATCH 2/2] build(deps): bump the prod group with 1 update (#7915) Bumps the prod group with 1 update: [vergen](https://github.com/rustyhorde/vergen). - [Release notes](https://github.com/rustyhorde/vergen/releases) - [Commits](https://github.com/rustyhorde/vergen/compare/8.2.5...8.2.6) --- updated-dependencies: - dependency-name: vergen dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- zebrad/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 18e05df926f..9a71e6f0eb9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4967,9 +4967,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "vergen" -version = "8.2.5" +version = "8.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e7dc29b3c54a2ea67ef4f953d5ec0c4085035c0ae2d325be1c0d2144bd9f16" +checksum = "1290fd64cc4e7d3c9b07d7f333ce0ce0007253e32870e632624835cc80b83939" dependencies = [ "anyhow", "git2", diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml index 3c7c9013a3b..ae2bc074a9c 100644 --- a/zebrad/Cargo.toml +++ b/zebrad/Cargo.toml @@ -227,7 +227,7 @@ proptest-derive = { version = "0.4.0", optional = true } console-subscriber = { version = "0.2.0", optional = true } [build-dependencies] -vergen = { version = "8.2.5", default-features = false, features = ["cargo", "git", "git2", "rustc"] } +vergen = { version = "8.2.6", default-features = false, features = ["cargo", "git", "git2", "rustc"] } # test feature lightwalletd-grpc-tests tonic-build = { version = "0.10.2", optional = true }