Merge branch 'main' into zktoolbox-add-holesky-testnet-support

matter-labs · Aug 19, 2024 · 37c3728 · 37c3728
2 parents 86d4c10 + f9ef00e
commit 37c3728
Show file tree

Hide file tree

Showing 416 changed files with 10,318 additions and 4,083 deletions.
diff --git a/.github/release-please/manifest.json b/.github/release-please/manifest.json
@@ -1,5 +1,5 @@
 {
-  "core": "24.17.0",
-  "prover": "16.3.0",
+  "core": "24.18.0",
+  "prover": "16.4.0",
   "zk_toolbox": "0.1.1"
 }
diff --git a/.github/workflows/ci-core-reusable.yml b/.github/workflows/ci-core-reusable.yml
@@ -63,7 +63,11 @@ jobs:
         run: ci_run yarn l1-contracts test
 
       - name: Rust unit tests
-        run: ci_run zk test rust
+        run: |
+          ci_run zk 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 zk f cargo test --release -p vm-benchmark --bench criterion --bench fill_bootloader
 
   loadtest:
     runs-on: [matterlabs-ci-runner]