Merge branch 'main' into afo/fix-serialization-issues

matter-labs · Mar 10, 2025 · 1510a2a · 1510a2a
2 parents c70f929 + fae3d84
commit 1510a2a
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 9 deletions.
diff --git a/.github/workflows/cargo-license.yaml b/.github/workflows/cargo-license.yaml
@@ -9,4 +9,4 @@ jobs:
       with:
         manifest-path: "./core/Cargo.toml"
         command: check
-        command-arguments: "--hide-inclusion-graph"
+        command-arguments: "--allow unmaintained --hide-inclusion-graph"
diff --git a/.github/workflows/publish-crates.yml b/.github/workflows/publish-crates.yml
@@ -28,7 +28,9 @@ jobs:
 
   publish-crates:
     name: Publish to crates.io
-    runs-on: matterlabs-ci-runner-high-performance
+    runs-on: matterlabs-ci-runner-highdisk
+    env:
+      ZKSYNC_USE_CUDA_STUBS: true
     steps:
       - name: Publish crates
         uses: matter-labs/zksync-ci-common/.github/actions/publish-crates@v1
@@ -40,3 +42,4 @@ jobs:
           run_build: ${{ inputs.run-build }}
           run_tests: ${{ inputs.run-tests }}
           gh_token: ${{ secrets.GITHUB_TOKEN }}
+          dependencies: 'clang libclang-dev'
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -31,6 +31,7 @@ jobs:
       upgrade-dependencies: true                            # Upgrade cross-workspace dependencies
       version-suffix: 'non-semver-compat'                   # Version suffix for the crates.io release
       workspace-dirs: 'core prover zkstack_cli'             # List of additional workspace directories to update Cargo.lock
+      dependencies: 'clang libclang-dev'                    # Additional Linux dependencies to install
 
   # Trigger workflow to publish zkstack binaries
   release-zkstack-cli-bins:

diff --git a/core/Cargo.lock b/core/Cargo.lock
diff --git a/core/bin/custom_genesis_export/Cargo.toml b/core/bin/custom_genesis_export/Cargo.toml
@@ -8,6 +8,7 @@ repository.workspace = true
 license.workspace = true
 keywords.workspace = true
 categories.workspace = true
+publish = false
 
 [dependencies]
 clap = { workspace = true, features = ["derive"] }

diff --git a/core/lib/queued_job_processor/Cargo.toml b/core/lib/queued_job_processor/Cargo.toml
@@ -14,7 +14,7 @@ categories.workspace = true
 [dependencies]
 anyhow.workspace = true
 async-trait.workspace = true
-tokio = { workspace = true, features = ["time"] }
+tokio = { workspace = true, features = ["sync", "time"] }
 tracing.workspace = true
 
 zksync_utils.workspace = true

diff --git a/core/lib/test_contracts/Cargo.toml b/core/lib/test_contracts/Cargo.toml
@@ -9,6 +9,7 @@ repository.workspace = true
 license.workspace = true
 keywords.workspace = true
 categories.workspace = true
+publish = false
 
 [dependencies]
 zksync_types.workspace = true