chore: resolve conflicts

matter-labs · Dec 4, 2024 · 56c96f6 · 56c96f6
2 parents 4c59efe + 2248338
commit 56c96f6
Show file tree

Hide file tree

Showing 24 changed files with 1,339 additions and 951 deletions.
diff --git a/.github/scripts/matrices.py b/.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(

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -17,6 +17,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-github-hosted-16core
     timeout-minutes: 60