Skip to content

Commit

Permalink
ci: rename wp1 -> sphinx
Browse files Browse the repository at this point in the history
  • Loading branch information
huitseeker committed Jun 3, 2024
1 parent 311b7b1 commit 80537e4
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ jobs:
[[ "$target" == *windows* ]] && exe=".exe"
RUSTFLAGS='-C target-feature=+crt-static' cargo build --release -p wp1-cli --target "$target" "${flags[@]}"
RUSTFLAGS='-C target-feature=+crt-static' cargo build --release -p sphinx-cli --target "$target" "${flags[@]}"
bins=(cargo-prove)
for name in "${bins[@]}"; do
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ jobs:
uses: ./.github/actions/setup
with:
pull_token: ${{ secrets.REPO_TOKEN }}
- name: Run cargo test on wp1 except the test_e2e_prove_groth16 recursion test
- name: Run cargo test on sphinx except the test_e2e_prove_groth16 recursion test
run: |
cargo nextest run --cargo-profile dev-ci --profile ci --workspace -E 'all() - test(test_e2e_prove_groth16)'
- name: Run cargo test with no default features
run: |
cargo nextest run -p wp1-core --cargo-profile dev-ci --profile ci --no-default-features --features debug -- cpu::trace::tests::generate_trace
cargo nextest run -p sphinx-core --cargo-profile dev-ci --profile ci --no-default-features --features debug -- cpu::trace::tests::generate_trace
working-directory: ${{ github.workspace }}/examples
- name: Install `cargo prove` CLI
run: |
cargo install --locked --path ./cli
cargo install --locked --force --path ./cli
cargo prove install-toolchain
working-directory: ${{ github.workspace }}

Expand All @@ -51,7 +51,7 @@ jobs:
pull_token: ${{ secrets.PRIVATE_PULL_TOEKN }}
- name: Run cargo test on the recursion circuit
run: |
cargo nextest run --cargo-profile dev-ci --profile ci -p wp1-recursion-circuit
cargo nextest run --cargo-profile dev-ci --profile ci -p sphinx-recursion-circuit
clippy:
runs-on: warp-ubuntu-latest-x64-16x
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
perf: false
- name: Install `cargo prove` CLI
run: |
cargo install --locked --path ./cli
cargo install --locked --force --path ./cli
cargo prove install-toolchain
working-directory: ${{ github.workspace }}
- name: Check examples
Expand All @@ -118,17 +118,17 @@ jobs:
cd cargo-prove-test/program
cat << EOF | tee -a Cargo.toml
[patch.'ssh://git@github.com/lurk-lab/wp1.git']
wp1-zkvm = { path = "../../zkvm/entrypoint" }
[patch.'ssh://git@github.com/lurk-lab/sphinx.git']
sphinx-zkvm = { path = "../../zkvm/entrypoint" }
EOF
cd ../..
cd cargo-prove-test/script
cat << EOF | tee -a Cargo.toml
[patch.'ssh://git@github.com/lurk-lab/sphinx.git']
wp1-sdk = { path = "../../sdk" }
wp1-helper = { path = "../../helper" }
sphinx-sdk = { path = "../../sdk" }
sphinx-helper = { path = "../../helper" }
EOF
cargo run --release
Expand All @@ -148,15 +148,15 @@ jobs:
pull_token: ${{ secrets.REPO_TOKEN }}
- name: Install `cargo prove` CLI
run: |
cargo install --locked --path ./cli
cargo install --locked --force --path ./cli
cargo prove install-toolchain
working-directory: ${{ github.workspace }}
- name: Run cargo test on wp1 except the prove_sp1 recursion test
- name: Run cargo test on sphinx except the prove_sp1 recursion test
run: |
cargo nextest run --cargo-profile dev-ci --profile ci -E 'all() - test(test_e2e_prove_groth16)'
- name: Run cargo test with no default features
run: |
cargo nextest run -p wp1-core --cargo-profile dev-ci --profile ci --no-default-features --features debug -- cpu::trace::tests::generate_trace
cargo nextest run -p sphinx-core --cargo-profile dev-ci --profile ci --no-default-features --features debug -- cpu::trace::tests::generate_trace
- name: check examples compile
run: |
for i in $(find ./ -maxdepth 1 -mindepth 1 -type d); do
Expand Down

0 comments on commit 80537e4

Please sign in to comment.