From 11757409c9b05fdb1ab7988355585eb4d03d38ef Mon Sep 17 00:00:00 2001 From: pgherveou Date: Tue, 19 Mar 2024 14:11:09 +0100 Subject: [PATCH] Move sandbox version to package instead of workspace --- Cargo.toml | 1 - RELEASES_CHECKLIST.md | 5 +++-- crates/e2e/Cargo.toml | 2 +- crates/e2e/sandbox/Cargo.toml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 21d45dd30ac..baba6ddd71f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -105,7 +105,6 @@ ink = { version = "=5.0.0", path = "crates/ink", default-features = false } ink_allocator = { version = "=5.0.0", path = "crates/allocator", default-features = false } ink_codegen = { version = "=5.0.0", path = "crates/ink/codegen", default-features = false } ink_e2e_macro = { version = "=5.0.0", path = "crates/e2e/macro", default-features = false } -ink_sandbox = { version = "=5.0.0", path = "crates/e2e/sandbox", default-features = false } ink_engine = { version = "=5.0.0", path = "crates/engine", default-features = false } ink_env = { version = "=5.0.0", path = "crates/env", default-features = false } ink_ir = { version = "=5.0.0", path = "crates/ink/ir", default-features = false } diff --git a/RELEASES_CHECKLIST.md b/RELEASES_CHECKLIST.md index 414429ffd10..e1036701595 100644 --- a/RELEASES_CHECKLIST.md +++ b/RELEASES_CHECKLIST.md @@ -60,7 +60,7 @@ in the future. - Release `cargo-contract` crates. - Request update of `drink` client, which depends on the `cargo-contract` crates. - Release `ink_e2e`. -2. Do a dry run with `cargo release [new_version] -v --no-tag --no-push` +2. Do a dry run with `cargo release [new_version] -v --no-tag --no-push --exclude ink_sandbox` - `[new_version]` should be the **exact** SemVer compatible version you are attempting to release e.g. `5.0.0` - It is possible to supply a SemVer level here e.g. `major`, `minor`, `patch` or @@ -69,6 +69,7 @@ in the future. is not necessary. - We don't want `cargo-release` to create any releases or push any code, we'll do that manually once we've actually published to `crates.io`. + - Note that `ink_sandbox` is released separetly and is excluded via the `--exclude` flag. 3. Check the output of the dry run: - Does not show any automatic bumping of crate versions. - Runs without error. @@ -82,7 +83,7 @@ in the future. `master` during the release. - The above are to ensure that the bundled code pushed to crates.io is the same as the tagged release on GitHub. -5. Publish with `cargo release [new_version] -v --no-tag --no-push --execute` +5. Publish with `cargo release [new_version] -v --no-tag --no-push --execute --exclude ink_sandbox` - Ensure the same `[new_version]` as the dry run, which should be the **exact** SemVer compatible version you are attempting to release e.g. `4.0.0-alpha.3`. - We add the grace period since crates depend on one another. diff --git a/crates/e2e/Cargo.toml b/crates/e2e/Cargo.toml index 1cbbb1fa6cc..a60d5522707 100644 --- a/crates/e2e/Cargo.toml +++ b/crates/e2e/Cargo.toml @@ -22,7 +22,7 @@ ink_primitives = { workspace = true, default-features = true } cargo_metadata = { workspace = true } contract-build = { workspace = true } -ink_sandbox = { workspace = true, optional = true } +ink_sandbox = { path = "./sandbox", optional = true } pallet-contracts-mock-network = { workspace = true, optional = true } funty = { workspace = true } impl-serde = { workspace = true } diff --git a/crates/e2e/sandbox/Cargo.toml b/crates/e2e/sandbox/Cargo.toml index db44cfa3e0b..3da2af09c73 100644 --- a/crates/e2e/sandbox/Cargo.toml +++ b/crates/e2e/sandbox/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ink_sandbox" -version.workspace = true +version = "5.0.0" authors = ["Cardinal Cryptography", "Parity Technologies "] edition.workspace = true license.workspace = true