Merge branch 'main' into feat/goldilocks-spartan

Author: darth-cy

.github/workflows/ci.yml

@@ -0,0 +1,99 @@
+name: Sanity checks
+
+on:
+  merge_group:
+  push:
+    branches:
+      - '**'
+
+jobs:
+  sanity:
+    name: Sanity check
+    timeout-minutes: 30
+    runs-on: ubuntu-24.04
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          components: rustfmt
+          # TODO(Matthias): see whether we can keep this in sync with rust-toolchain.toml automatically?
+          toolchain: nightly-2024-10-03
+      - name: Cargo cache
+        uses: actions/cache@v3
+        with:
+            # target directories gotten via
+            # `find . -name target -type d -not -path '*/src/*' -printf '%P\n' | sort`
+            # We need to exclude `./circ_blocks/src/target` because it just a source directory with an unfortunate name.
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            circ_blocks/circ_fields/target
+            circ_blocks/circ_hc/target
+            circ_blocks/circ_opt/target
+            circ_blocks/circ_waksman/target
+            circ_blocks/target
+            circ_blocks/third_party/ZoKrates/zokrates_parser/target
+            circ_blocks/third_party/ZoKrates/zokrates_pest_ast/target
+            circ_blocks/third_party/ZoKrates/zokrates_stdlib/target
+            ff/ff_derive/target
+            ff/target
+            spartan_parallel/target
+            zok_tests/poseidon_gen/target
+          key: sanity-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock', '**/Cargo.toml') }}
+
+      - name: Run sanity check
+        run: |
+            set -euxo pipefail
+
+            for cargo_toml in $(git ls-files '**/Cargo.toml'); do
+                (
+                    cd "$(dirname ${cargo_toml})"
+                    cargo fmt --check
+                    cargo check --all-targets
+                )
+            done
+
+  legacy-scripts:
+    name: Run legacy scripts
+    timeout-minutes: 30
+    runs-on: ubuntu-24.04
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          # TODO(Matthias): see whether we can keep this in sync with rust-toolchain.toml automatically?
+          toolchain: nightly-2024-10-03
+      - name: Cargo cache
+        uses: actions/cache@v3
+        with:
+            # target directories gotten via
+            # `find . -name target -type d -not -path '*/src/*' -printf '%P\n' | sort`
+            # We need to exclude `./circ_blocks/src/target` because it just a source directory with an unfortunate name.
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            circ_blocks/circ_fields/target
+            circ_blocks/circ_hc/target
+            circ_blocks/circ_opt/target
+            circ_blocks/circ_waksman/target
+            circ_blocks/target
+            circ_blocks/third_party/ZoKrates/zokrates_parser/target
+            circ_blocks/third_party/ZoKrates/zokrates_pest_ast/target
+            circ_blocks/third_party/ZoKrates/zokrates_stdlib/target
+            ff/ff_derive/target
+            ff/target
+            spartan_parallel/target
+            zok_tests/poseidon_gen/target
+          key: scripts-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock', '**/Cargo.toml') }}
+
+      - name: Run legacy scripts
+        run: |
+            set -euxo pipefail
+            ./setup.sh
+            ./encode_ceno.sh

.gitmodules

@@ -28,17 +28,25 @@ Work in progress
 * Please review `zok_format.md` first, especially the `.input` and `.witness` section.
 * Clone or switch to the custom branch `https://github.com/scroll-tech/ceno/tree/kunming/recursive_verifier`.
 * Navigate to `ceno/ceno_zkvm` and run the benchmark: `RAYON_NUM_THREADS=1 cargo run --example riscv_opcodes` (might not work with multicore)
-* For every benchmark, copy lines below `INPUT:` to `zok_tests/benchmarks/ceno_demo/tower_verifier.input`  
-and lines below `WITNESS:` to `zok_tests/benchmarks/ceno_demo/tower_verifier.witness`,  
+* For every benchmark, copy lines below `INPUT:` to `zok_tests/benchmarks/ceno_demo/tower_verifier.input`
+and lines below `WITNESS:` to `zok_tests/benchmarks/ceno_demo/tower_verifier.witness`,
 don't forget the `END` at the end of each file
 * Run the ceno verifier: `bash encode_ceno.sh`
 * I know this is looks stupid, I'm trying to come up with a better solution.
 
 ## Other compilation flags and functionalities
 Many flags are WIP. For temporary hacks, alter the code directly and recompile through `bash setup.sh`
 
-#### Verbose outputs for 
+#### Verbose outputs for
 
 #### Working with a different field
 
 #### Verify circuit using `spartan_parallel` (only supported in Curve25519)
+
+# Continuous Integration
+
+At the moment we only have a [simple CI](.github/workflows/) that checks formatting and `cargo check` and runs [setup.sh](setup.sh) and [encode_ceno.sh](encode_ceno.sh).
+
+TODO:
+- [ ] run tests in CI, too.  (That means we need to fix our tests.)
+- [ ] reorganise the code, so that we only need a single `carge check` or `cargo test` instead of having to run that in a dozen different directories.