From 64fcd75f856e82348b79af17dd88e278d0f32596 Mon Sep 17 00:00:00 2001 From: Ryo Onodera Date: Fri, 23 Jun 2023 16:32:16 +0900 Subject: [PATCH] make ci fail yet again with new misconfigured child dep --- Cargo.lock | 7 +++++++ Cargo.toml | 2 ++ banking-bench/Cargo.toml | 3 +++ banking-bench/src/lib.rs | 1 + banking-bench2/Cargo.toml | 15 +++++++++++++++ banking-bench2/src/main.rs | 1 + scripts/check-dev-utils.sh | 1 + 7 files changed, 30 insertions(+) create mode 100644 banking-bench/src/lib.rs create mode 100644 banking-bench2/Cargo.toml create mode 100644 banking-bench2/src/main.rs diff --git a/Cargo.lock b/Cargo.lock index 29e0da1020aece..8db0a627546da6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5118,6 +5118,13 @@ dependencies = [ "solana-version", ] +[[package]] +name = "solana-banking-bench2" +version = "1.17.0" +dependencies = [ + "solana-banking-bench", +] + [[package]] name = "solana-banks-client" version = "1.17.0" diff --git a/Cargo.toml b/Cargo.toml index 980ee463218c85..039678318ecee8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,6 +4,7 @@ members = [ "accounts-bench", "accounts-cluster-bench", "banking-bench", + "banking-bench2", "banks-client", "banks-interface", "banks-server", @@ -294,6 +295,7 @@ soketto = "0.7" solana_rbpf = "=0.5.0" solana-account-decoder = { path = "account-decoder", version = "=1.17.0" } solana-address-lookup-table-program = { path = "programs/address-lookup-table", version = "=1.17.0" } +solana-banking-bench = { path = "banking-bench", version = "=1.17.0" } solana-banks-client = { path = "banks-client", version = "=1.17.0" } solana-banks-interface = { path = "banks-interface", version = "=1.17.0" } solana-banks-server = { path = "banks-server", version = "=1.17.0" } diff --git a/banking-bench/Cargo.toml b/banking-bench/Cargo.toml index f9c1e383df64d3..2b772644d75f04 100644 --- a/banking-bench/Cargo.toml +++ b/banking-bench/Cargo.toml @@ -34,3 +34,6 @@ targets = ["x86_64-unknown-linux-gnu"] [features] dev-utils = [] dev-utils-ci-marker = ["dev-utils"] + +[lib] +crate-type = ["cdylib", "rlib"] diff --git a/banking-bench/src/lib.rs b/banking-bench/src/lib.rs new file mode 100644 index 00000000000000..8b137891791fe9 --- /dev/null +++ b/banking-bench/src/lib.rs @@ -0,0 +1 @@ + diff --git a/banking-bench2/Cargo.toml b/banking-bench2/Cargo.toml new file mode 100644 index 00000000000000..ce4abfbc04ab03 --- /dev/null +++ b/banking-bench2/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "solana-banking-bench2" +publish = false +version = { workspace = true } +authors = { workspace = true } +repository = { workspace = true } +homepage = { workspace = true } +license = { workspace = true } +edition = { workspace = true } + +[dependencies] +solana-banking-bench = { workspace = true } + +[package.metadata.docs.rs] +targets = ["x86_64-unknown-linux-gnu"] diff --git a/banking-bench2/src/main.rs b/banking-bench2/src/main.rs new file mode 100644 index 00000000000000..f328e4d9d04c31 --- /dev/null +++ b/banking-bench2/src/main.rs @@ -0,0 +1 @@ +fn main() {} diff --git a/scripts/check-dev-utils.sh b/scripts/check-dev-utils.sh index d0de4dc56f5027..80a5d04291e9ef 100755 --- a/scripts/check-dev-utils.sh +++ b/scripts/check-dev-utils.sh @@ -30,6 +30,7 @@ source ci/rust-version.sh nightly # dependencies should be edited likewise if any. declare dev_util_tainted_packages=( "solana-banking-bench" + "solana-banking-bench2" ) mode=${1:-full}