fix conflicts

Sovereign-Labs · Oct 9, 2023 · ec22381 · ec22381
2 parents 091c7da + 367585e
commit ec22381
Show file tree

Hide file tree

Showing 117 changed files with 4,531 additions and 1,304 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -70,7 +70,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: rui314/setup-mold@v1
       - name: Install Rust
-        run: rustup show && rustup install nightly && rustup component add rustfmt --toolchain nightly-x86_64-unknown-linux-gnu  # Nightly is needed for our configuration of cargo fmt
+        run: rustup show && rustup install nightly && rustup component add rustfmt --toolchain nightly-x86_64-unknown-linux-gnu # Nightly is needed for our configuration of cargo fmt
       - name: Install cargo-risc0 # Risc0 v0.17 and higher require a cargo extension to build the guest code
         run: cargo install cargo-risczero
       - name: Install risc0-zkvm toolchain # Use the risc0 cargo extension to install the risc0 std library for the current toolchain
@@ -80,6 +80,9 @@ jobs:
           cache-provider: "buildjet"
           shared-key: cargo-check
           save-if: ${{ github.ref == 'refs/heads/nightly' }}
+          workspaces: |
+            .
+            fuzz
       - name: Run lint
         run: |
           if ! make lint ; then
@@ -109,12 +112,15 @@ jobs:
           cache-provider: "buildjet"
           shared-key: cargo-check
           save-if: ${{ github.ref == 'refs/heads/nightly' }}
+          workspaces: |
+            .
+            fuzz
       # intentionally no target specifier; see https://github.com/jonhoo/rust-ci-conf/pull/4
       - name: cargo hack
         run: make check-features
   test:
     name: test
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: buildjet-16vcpu-ubuntu-2204
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v3