ci: try to fix paths from zkstack

matter-labs · Dec 19, 2024 · f22d8ab · f22d8ab
1 parent 2a3b548
commit f22d8ab
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/docker/contract-verifier/Dockerfile b/docker/contract-verifier/Dockerfile
@@ -16,7 +16,7 @@ ENV RUSTC_WRAPPER=${RUSTC_WRAPPER}
 
 WORKDIR /usr/src/zksync
 COPY . .
-
+WORKDIR /usr/src/zksync/core
 RUN cargo build --release --bin zksync_contract_verifier
 
 FROM ghcr.io/matter-labs/zksync-runtime-base:latest

diff --git a/docker/external-node/Dockerfile b/docker/external-node/Dockerfile
@@ -15,6 +15,7 @@ ENV RUSTC_WRAPPER=${RUSTC_WRAPPER}
 
 WORKDIR /usr/src/zksync
 COPY . .
+WORKDIR /usr/src/zksync/core
 RUN cargo build --release --bin zksync_external_node --bin block_reverter
 
 FROM ghcr.io/matter-labs/zksync-runtime-base:latest

diff --git a/docker/snapshots-creator/Dockerfile b/docker/snapshots-creator/Dockerfile
@@ -14,7 +14,7 @@ ENV RUSTC_WRAPPER=${RUSTC_WRAPPER}
 
 WORKDIR /usr/src/zksync
 COPY . .
-
+WORKDIR /usr/src/zksync/core
 RUN cargo build --release --bin snapshots_creator
 
 FROM ghcr.io/matter-labs/zksync-runtime-base:latest

diff --git a/docker/verified-sources-fetcher/Dockerfile b/docker/verified-sources-fetcher/Dockerfile
@@ -15,7 +15,7 @@ ENV RUSTC_WRAPPER=${RUSTC_WRAPPER}
 
 WORKDIR /usr/src/zksync
 COPY . .
-
+WORKDIR /usr/src/zksync/core
 RUN cargo build --release --bin verified_sources_fetcher
 
 FROM ghcr.io/matter-labs/zksync-runtime-base:latest

diff --git a/zkstack_cli/crates/zkstack/src/commands/dev/commands/fmt.rs b/zkstack_cli/crates/zkstack/src/commands/dev/commands/fmt.rs
@@ -42,7 +42,7 @@ async fn prettier_contracts(shell: Shell, check: bool) -> anyhow::Result<()> {
 }
 
 async fn rustfmt(shell: Shell, check: bool, link_to_code: PathBuf) -> anyhow::Result<()> {
-    for dir in [".", "prover", "zkstack_cli"] {
+    for dir in ["core", "prover", "zkstack_cli"] {
         let spinner = Spinner::new(&msg_running_rustfmt_for_dir_spinner(dir));
         let _dir = shell.push_dir(link_to_code.join(dir));
         let mut cmd = cmd!(shell, "cargo fmt -- --config imports_granularity=Crate --config group_imports=StdExternalCrate");

diff --git a/zkstack_cli/crates/zkstack/src/commands/dev/commands/test/prover.rs b/zkstack_cli/crates/zkstack/src/commands/dev/commands/test/prover.rs
@@ -20,7 +20,7 @@ pub async fn run(shell: &Shell) -> anyhow::Result<()> {
     }];
     reset_test_databases(shell, &ecosystem.link_to_code, dals).await?;
 
-    let _dir_guard = shell.push_dir(ecosystem.link_to_code.join("prover"));
+    let _dir_guard = shell.push_dir(ecosystem.join("prover"));
     Cmd::new(cmd!(shell, "cargo test --release --workspace --locked"))
         .with_force_run()
         .env("TEST_DATABASE_PROVER_URL", TEST_DATABASE_PROVER_URL)