From 27ecef9313cc4ba523cf21003d755e2c12f42ff4 Mon Sep 17 00:00:00 2001 From: Anton Baliasnikov Date: Fri, 20 Dec 2024 11:53:56 +0000 Subject: [PATCH] more fixes --- .github/workflows/ci-core-reusable.yml | 2 +- core/bin/zksync_tee_prover/Cargo.toml | 2 +- zkstack_cli/crates/zkstack/src/commands/prover/run.rs | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-core-reusable.yml b/.github/workflows/ci-core-reusable.yml index d76bb776968d..73aa46503efa 100644 --- a/.github/workflows/ci-core-reusable.yml +++ b/.github/workflows/ci-core-reusable.yml @@ -82,7 +82,7 @@ jobs: ci_run zkstack dev test rust # Benchmarks are not tested by `cargo nextest` unless specified explicitly, and even then `criterion` harness is incompatible # with how `cargo nextest` runs tests. Thus, we run criterion-based benchmark tests manually. - ci_run cargo test --release -p vm-benchmark --bench oneshot --bench batch + ci_run cargo test --manifest-path ./core/Cargo.toml --release -p vm-benchmark --bench oneshot --bench batch loadtest: runs-on: [ matterlabs-ci-runner-high-performance ] diff --git a/core/bin/zksync_tee_prover/Cargo.toml b/core/bin/zksync_tee_prover/Cargo.toml index 303ad30cf2ac..b853da348ee0 100644 --- a/core/bin/zksync_tee_prover/Cargo.toml +++ b/core/bin/zksync_tee_prover/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "zksync_tee_prover" description = "ZKsync TEE prover" -version.workspace = true +version = "0.1.0" edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/zkstack_cli/crates/zkstack/src/commands/prover/run.rs b/zkstack_cli/crates/zkstack/src/commands/prover/run.rs index aab62e51064e..f5420312d55c 100644 --- a/zkstack_cli/crates/zkstack/src/commands/prover/run.rs +++ b/zkstack_cli/crates/zkstack/src/commands/prover/run.rs @@ -96,6 +96,7 @@ pub(crate) async fn run(args: ProverRunArgs, shell: &Shell) -> anyhow::Result<() update_setup_data_path(&chain, "data/keys".to_string())?; run_binary_component( shell, + "prover/Cargo.toml", component.binary_name(), &application_args, &additional_args, @@ -135,6 +136,7 @@ fn run_dockerized_component( fn run_binary_component( shell: &Shell, + manifest: &str, binary_name: &str, application_args: &[String], args: &[String], @@ -145,7 +147,7 @@ fn run_binary_component( let mut cmd = Cmd::new(cmd!( shell, - "cargo run --manifest-path ./core/Cargo.toml {application_args...} --release --bin {binary_name} -- {args...}" + "cargo run --manifest-path {manifest} {application_args...} --release --bin {binary_name} -- {args...}" )); cmd = cmd.with_force_run(); cmd.run().context(error)