Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add scarb prove #1900

Merged
merged 75 commits into from
Jan 31, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
c658194
feat: executable command
FroyaTheHen Jan 8, 2025
af5414d
Initial `cairo-prove`
DelevoXDG Jan 17, 2025
ccc3aa3
Support prover config; Restructure args
DelevoXDG Jan 17, 2025
972acdd
Restructure `cairo-execute` output directories
DelevoXDG Jan 17, 2025
6036329
Refactor; Improve error messages; Improve args
DelevoXDG Jan 17, 2025
0a404e4
Add tests
DelevoXDG Jan 17, 2025
55525ed
Refactor
DelevoXDG Jan 17, 2025
0da153d
Format
DelevoXDG Jan 17, 2025
cb4b7fb
Add `--execute` flag to run execution before `prove`
DelevoXDG Jan 18, 2025
3946387
Refactor: add helper functions; Simplify `execution_number` extractio…
DelevoXDG Jan 18, 2025
951e3d7
Improve error messages in line with `scarb execute` changes
DelevoXDG Jan 18, 2025
ff83e91
use lossy utf8 conversion
DelevoXDG Jan 18, 2025
3c31623
misc: rename test
DelevoXDG Jan 18, 2025
5bb3424
rename all "execution number" mentions to `execution_id`
DelevoXDG Jan 18, 2025
01070f1
Add verbosity settings
DelevoXDG Jan 18, 2025
e02f52d
fix tests (`--execution-id`)
DelevoXDG Jan 18, 2025
e82596a
Disable `scarb execute` output for quiet verbosity
DelevoXDG Jan 18, 2025
39f1f70
Stream AND write output of subcommand on the fly
DelevoXDG Jan 18, 2025
de0d76d
Format
DelevoXDG Jan 18, 2025
72e223b
improve approach to streaming stdout of nested commands
DelevoXDG Jan 18, 2025
2ab30cd
refactor: rename scarb-cairo-{execute,prove} to scarb-{execute,prove}
DelevoXDG Jan 18, 2025
e6556de
finish `scarb-cairo-{execute,prove}` -> `scarb-{execute,prove}``
DelevoXDG Jan 18, 2025
c7e0dc6
Merge branch 'main' into zdobnikau/stwo-prove
DelevoXDG Jan 18, 2025
242e179
format
DelevoXDG Jan 18, 2025
48a1399
lock
DelevoXDG Jan 18, 2025
375195c
update ci
DelevoXDG Jan 20, 2025
a9e7e28
fix `scarb execute` tests
DelevoXDG Jan 21, 2025
d19a6e1
`--exclude` not supported by rustfmt
DelevoXDG Jan 21, 2025
03593e3
install components in `check-rust-scarb-prove`
DelevoXDG Jan 21, 2025
e9e2a15
Fix build in `test-scarb-prove`
DelevoXDG Jan 21, 2025
60de69f
fmt
DelevoXDG Jan 21, 2025
e42b960
fix `check-rust`
DelevoXDG Jan 21, 2025
eea251e
fix test-scarb-prove
DelevoXDG Jan 21, 2025
21a899c
fmt
DelevoXDG Jan 21, 2025
a1e1fe2
remove config.toml
DelevoXDG Jan 21, 2025
fa3ddf4
fix clippy ci
DelevoXDG Jan 21, 2025
6936618
fix tests
DelevoXDG Jan 21, 2025
a3ce3a4
fix ci
DelevoXDG Jan 21, 2025
d783d03
support arguments file
DelevoXDG Jan 21, 2025
57839d4
fmt
DelevoXDG Jan 21, 2025
1eb0f34
fmt
DelevoXDG Jan 21, 2025
4218467
update `extract_execution_id`
DelevoXDG Jan 21, 2025
67fb1ac
Link #1915
DelevoXDG Jan 24, 2025
78619fe
add warning re proof instability
DelevoXDG Jan 24, 2025
f87b63d
Revert "remove config.toml"
DelevoXDG Jan 28, 2025
4203a8c
add missing env: in ci
DelevoXDG Jan 28, 2025
063e8a3
ensure can format
DelevoXDG Jan 28, 2025
91a2e0c
add requested comment
DelevoXDG Jan 28, 2025
c8fe963
add missing env: in ci
DelevoXDG Jan 28, 2025
662b438
run `cargo fmt` inside a single job
DelevoXDG Jan 28, 2025
ce6c534
ci: remove unnecessary build step in `test-scarb-prove`
DelevoXDG Jan 28, 2025
1202a47
Merge branch 'main' into zdobnikau/stwo-prove
DelevoXDG Jan 28, 2025
e50f09c
lock
DelevoXDG Jan 28, 2025
7b2c5eb
remove support for path inputs
DelevoXDG Jan 28, 2025
8231ae5
require `--execute` as default arg
DelevoXDG Jan 28, 2025
8f6d6ca
fix order of "proving" msg
DelevoXDG Jan 28, 2025
a000eeb
split cairo-execute into subfiles
DelevoXDG Jan 28, 2025
a969fce
split scarb-execute into subfiles
DelevoXDG Jan 28, 2025
14c6a42
Merge branch 'zdobnikau/split-execute' into zdobnikau/stwo-prove
DelevoXDG Jan 28, 2025
cef4601
refactor `execute` args
DelevoXDG Jan 28, 2025
50482ed
update scarb-execute::main_inner to return execution_id
DelevoXDG Jan 28, 2025
cdac854
call scarb-execute directly in scarb-prove to retireve execution_id
DelevoXDG Jan 28, 2025
bd68867
ci: cache on nightly in `test-scarb-prove`
DelevoXDG Jan 28, 2025
e31ae82
remove unnecessary changes related to stdout execution_id extraction
DelevoXDG Jan 28, 2025
b2493e1
handle cairo-pie output explicitly
DelevoXDG Jan 28, 2025
6503636
use assert instead of ensure
DelevoXDG Jan 31, 2025
f23c968
apply suggestions re. `scarb-execute` re-use
DelevoXDG Jan 31, 2025
d6f9446
cairo-pie.zip
DelevoXDG Jan 31, 2025
1864fe2
cairo-pie.zip: refactor cleanup
DelevoXDG Jan 31, 2025
779d062
Merge branch 'main' into zdobnikau/stwo-prove
DelevoXDG Jan 31, 2025
21a2789
post-merge fixes
DelevoXDG Jan 31, 2025
3f678dd
drop windows support
DelevoXDG Jan 31, 2025
97e321e
revert thiserror dependency
DelevoXDG Jan 31, 2025
ce83714
relocate warning
DelevoXDG Jan 31, 2025
47eb485
update arg conflicts
DelevoXDG Jan 31, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 52 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- uses: Swatinem/rust-cache@v2
- uses: taiki-e/install-action@nextest
- name: nextest archive
run: cargo nextest archive --workspace --all-features --cargo-profile ci --archive-file 'nextest-archive-${{ matrix.platform.os }}.tar.zst'
run: cargo nextest archive --workspace --all-features --cargo-profile ci --archive-file 'nextest-archive-${{ matrix.platform.os }}.tar.zst' --exclude scarb-prove
- uses: actions/upload-artifact@v4
with:
name: nextest-archive-${{ matrix.platform.os }}
Expand Down Expand Up @@ -82,6 +82,32 @@ jobs:
- name: run tests
run: cargo test -p scarb-metadata

test-scarb-prove:
name: test scarb-prove ${{ matrix.platform.name }}
runs-on: ${{ matrix.platform.os }}
env:
# TODO(#1915): Use stable toolchain once stwo is stable.
RUST_TOOLCHAIN: "nightly-2025-01-02"
strategy:
fail-fast: false
matrix:
platform:
- name: linux x86-64
os: ubuntu-latest
- name: windows x86-64
os: windows-latest
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_TOOLCHAIN }}
- uses: Swatinem/rust-cache@v2
- name: Build
run: cargo +stable build --workspace --all-features --exclude scarb-prove
- name: Run scarb-prove tests
run: cargo +${{ env.RUST_TOOLCHAIN }} test -p scarb-prove

test-prebuilt-plugins:
name: test prebuilt plugins ${{ matrix.platform.name }}
runs-on: ${{ matrix.platform.os }}
Expand Down Expand Up @@ -113,15 +139,38 @@ jobs:
- uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
- run: cargo fmt --check
- run: cargo clippy --all-targets --all-features -- --no-deps
# TODO(#1915): Build all crates with stable toolchain once stwo is stable.
- run: cargo clippy --all-targets --all-features --workspace --exclude scarb-prove -- --no-deps
DelevoXDG marked this conversation as resolved.
Show resolved Hide resolved
env:
# Make sure CI fails on all warnings, including Clippy lints.
RUSTFLAGS: "-Dwarnings"
- run: cargo doc --all-features --no-deps
- run: cargo doc --all-features --no-deps --workspace --exclude scarb-prove
DelevoXDG marked this conversation as resolved.
Show resolved Hide resolved
env:
# Make sure CI fails on all warnings, including Clippy lints.
RUSTDOCFLAGS: "-Dwarnings"

check-rust-scarb-prove:
name: check-rust (scarb-prove)
runs-on: ubuntu-latest
env:
# TODO(#1915): Use stable toolchain once stwo is stable.
RUST_TOOLCHAIN: "nightly-2025-01-02"
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_TOOLCHAIN }}
components: rustfmt, clippy
- uses: Swatinem/rust-cache@v2
- run: cargo +${{ env.RUST_TOOLCHAIN }} clippy --all-targets --all-features -p scarb-prove -- --no-deps
env:
# Make sure CI fails on all warnings, including Clippy lints.
RUSTFLAGS: "-Dwarnings"
- run: cargo +${{ env.RUST_TOOLCHAIN }} doc --all-features --no-deps -p scarb-prove
DelevoXDG marked this conversation as resolved.
Show resolved Hide resolved
env:
# Make sure CI fails on all warnings, including Clippy lints.
RUSTDOCFLAGS: "-Dwarnings"

check-website:
runs-on: ubuntu-latest
defaults:
Expand Down
Loading