chore: merge main into upstream-fef2098

.github/scripts/matrices.py

@@ -71,8 +71,9 @@ def __init__(
 # TODO: Figure out how to make this work
 # t_linux_arm = Target("ubuntu-latest", "aarch64-unknown-linux-gnu", "linux-aarch64")
 t_macos = Target("macos-latest", "aarch64-apple-darwin", "macosx-aarch64")
-t_windows = Target("windows-latest", "x86_64-pc-windows-msvc", "windows-amd64")
-targets = [t_linux_x86, t_windows] if is_pr else [t_linux_x86, t_macos, t_windows]
+# NOTE(zk): ZKsync-era doesn't support windows as of now
+# t_windows = Target("windows-latest", "x86_64-pc-windows-msvc", "windows-amd64")
+targets = [t_linux_x86] if is_pr else [t_linux_x86, t_macos]
 
 config = [
     Case(

.github/workflows/test.yml

@@ -19,6 +19,12 @@ env:
     TARGET_RUST_VERSION: "nightly-2024-09-01"
 
 jobs:
+    nextest:
+      uses: ./.github/workflows/nextest.yml
+      with:
+        profile: default
+      secrets: inherit
+
     doctest:
         runs-on: ubuntu-22.04
         timeout-minutes: 60
@@ -112,6 +118,9 @@ jobs:
           with:
             toolchain: ${{ env.TARGET_RUST_VERSION }}
 
+        - name: Install cargo-nextest
+          uses: taiki-e/install-action@nextest
+
         - name: Run era-test-node
           uses: dutterbutter/era-test-node-action@v1
           with:
@@ -130,7 +139,8 @@ jobs:
           env:
             RUST_BACKTRACE: full
             TEST_MAINNET_URL: http://localhost:8011
-          run: ZK_DEBUG_HISTORICAL_BLOCK_HASHES=5 cargo test zk
+          run: |
+            ZK_DEBUG_HISTORICAL_BLOCK_HASHES=5 cargo nextest run --package '*' --lib --test '*' --filter-expr 'test(~zk)'
 
     check-ci-install:
       name: CI install