Skip to content

Commit

Permalink
feat: v1.2.0-rc1 (#1389)
Browse files Browse the repository at this point in the history
  • Loading branch information
mattstam committed Aug 27, 2024
2 parents 5786734 + c1ff739 commit 54a8f60
Show file tree
Hide file tree
Showing 753 changed files with 48,400 additions and 15,220 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ updates:
- dependency-name: "axum"
versions: ["> 0.7.4"]
- package-ecosystem: "docker"
directory: "/cli/docker"
directory: "/crates/cli/docker"
schedule:
interval: "weekly"
target-branch: "dev"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ jobs:
- name: Build and push Docker image
uses: docker/build-push-action@v6
with:
context: ./cli/docker
file: ./cli/docker/Dockerfile
context: ./crates/cli/docker
file: ./crates/cli/docker/Dockerfile
push: true
tags: ${{ steps.docker_tagging.outputs.docker_tags }}
labels: ${{ steps.meta.outputs.labels }}
Expand Down
19 changes: 7 additions & 12 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@ on:
branches:
- main
paths:
- "cli/**"
- "core/**"
- "prover/**"
- "recursion/**"
- "derive/**"
- "sdk/**"
- "crates/**"
- ".github/workflows/**"

concurrency:
Expand Down Expand Up @@ -118,18 +113,18 @@ jobs:
- name: Install SP1 CLI
run: |
cd cli
cd crates/cli
cargo install --force --locked --path .
cd ~
- name: Run script
run: |
cd examples/ssz-withdrawals/program
cargo add sp1-zkvm --path $GITHUB_WORKSPACE/zkvm/entrypoint
cargo add sp1-zkvm --path $GITHUB_WORKSPACE/crates/zkvm/entrypoint
cargo prove build
cd ../script
cargo remove sp1-sdk
cargo add sp1-sdk --path $GITHUB_WORKSPACE/sdk
cargo add sp1-sdk --path $GITHUB_WORKSPACE/crates/sdk
SP1_DEV=1 RUST_LOG=info cargo run --release
tendermint:
Expand Down Expand Up @@ -158,16 +153,16 @@ jobs:
- name: Install SP1 CLI
run: |
cd cli
cd crates/cli
cargo install --force --locked --path .
cd ~
- name: Run script
run: |
cd examples/tendermint/program
cargo add sp1-zkvm --path $GITHUB_WORKSPACE/zkvm/entrypoint
cargo add sp1-zkvm --path $GITHUB_WORKSPACE/crates/zkvm/entrypoint
cargo prove build
cd ../script
cargo remove sp1-sdk
cargo add sp1-sdk --path $GITHUB_WORKSPACE/sdk
cargo add sp1-sdk --path $GITHUB_WORKSPACE/crates/sdk
SP1_DEV=1 RUST_LOG=info cargo run --release
50 changes: 38 additions & 12 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,7 @@ on:
branches:
- "**"
paths:
- "cli/**"
- "core/**"
- "prover/**"
- "recursion/**"
- "derive/**"
- "sdk/**"
- "zkvm/**"
- "tests/**"
- "crates/**"
- "examples/**"
- "Cargo.toml"
- ".github/workflows/**"
Expand All @@ -25,6 +18,39 @@ concurrency:
cancel-in-progress: true

jobs:
test-fast:
name: Test (fast-experimental)
runs-on: runs-on,runner=64cpu-linux-x64,spot=false
env:
CARGO_NET_GIT_FETCH_WITH_CLI: "true"
steps:
- name: Checkout sources
uses: actions/checkout@v4

- name: Setup CI
uses: ./.github/actions/setup

- name: Run cargo check
uses: actions-rs/cargo@v1
with:
command: check
toolchain: 1.79.0
args: --all-targets --all-features

- name: Run cargo test core-v2
uses: actions-rs/cargo@v1
with:
command: test
toolchain: 1.79.0
args: --release --package sp1-recursion-core-v2 --package sp1-recursion-circuit-v2 --features native-gnark
env:
RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0 -C target-cpu=native
RUST_BACKTRACE: 1
FRI_QUERIES: 1
SP1_DEV: 1



test-x86:
name: Test (x86-64)
runs-on:
Expand Down Expand Up @@ -147,7 +173,7 @@ jobs:
- name: Install SP1 CLI
run: |
cd cli
cd crates/cli
cargo install --force --locked --path .
~/.sp1/bin/cargo-prove prove install-toolchain
cd ~
Expand Down Expand Up @@ -177,7 +203,7 @@ jobs:
- name: Install SP1 CLI
run: |
cd cli
cd crates/cli
cargo install --force --locked --path .
cd ~
Expand All @@ -189,9 +215,9 @@ jobs:
run: |
cd fibonacci
cd program
cargo add sp1-zkvm --path $GITHUB_WORKSPACE/zkvm/entrypoint
cargo add sp1-zkvm --path $GITHUB_WORKSPACE/crates/zkvm/entrypoint
cargo prove build
cd ../script
cargo remove sp1-sdk
cargo add sp1-sdk --path $GITHUB_WORKSPACE/sdk
cargo add sp1-sdk --path $GITHUB_WORKSPACE/crates/sdk
SP1_DEV=1 RUST_LOG=info cargo run --release -- --prove
2 changes: 2 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
// // Examples.
// "examples/chess/program/Cargo.toml",
// "examples/chess/script/Cargo.toml",
// "examples/cycle-tracking/program/Cargo.toml",
// "examples/cycle-tracking/script/Cargo.toml",
// "examples/fibonacci/program/Cargo.toml",
// "examples/fibonacci/script/Cargo.toml",
// "examples/io/program/Cargo.toml",
Expand Down
Loading

0 comments on commit 54a8f60

Please sign in to comment.