Skip to content

Commit

Permalink
revert: "chore: v1.0.1-testnet" (#701)
Browse files Browse the repository at this point in the history
  • Loading branch information
jtguibas authored May 10, 2024
1 parent c08c64b commit 1db2197
Show file tree
Hide file tree
Showing 138 changed files with 2,505 additions and 17,030 deletions.
5 changes: 5 additions & 0 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,8 @@ runs:
shell: bash
run: |
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain nightly-2024-04-17 -y
source $HOME/.cargo/env
rustup set profile minimal
rustup component add rustfmt clippy
rustup show
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
10 changes: 0 additions & 10 deletions .github/dependabot.yml

This file was deleted.

187 changes: 13 additions & 174 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
@@ -1,180 +1,19 @@
name: PR
name: PR Lint

on:
push:
branches: [main, dev]
pull_request:
branches:
- "**"
paths:
- "cli/**"
- "core/**"
- "prover/**"
- "recursion/**"
- "sdk/**"
- ".github/workflows/**"
merge_group:

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
pull_request_target:
types:
- opened
- edited

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

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

- name: Run cargo check
uses: actions-rs/cargo@v1
with:
command: check
toolchain: nightly-2024-04-17
args: --all-targets --all-features

- name: Run cargo test
uses: actions-rs/cargo@v1
with:
command: test
toolchain: nightly-2024-04-17
args: --release -- --nocapture
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-arm:
name: Test (ARM)
runs-on: runs-on,runner=64cpu-linux-arm64
env:
CARGO_NET_GIT_FETCH_WITH_CLI: "true"
steps:
- name: Checkout sources
uses: actions/checkout@v2
permissions:
pull-requests: read

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

- name: Run cargo check
uses: actions-rs/cargo@v1
with:
command: check
toolchain: nightly-2024-04-17
args: --all-targets --all-features

- name: Run cargo test
uses: actions-rs/cargo@v1
with:
command: test
toolchain: nightly-2024-04-17
args: --release
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

lint:
name: Formatting & Clippy
runs-on: runs-on,runner=8cpu-linux-x64
env:
CARGO_NET_GIT_FETCH_WITH_CLI: "true"
jobs:
main:
name: Title
runs-on: warp-ubuntu-latest-arm64-4x
steps:
- name: Checkout sources
uses: actions/checkout@v2

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

- name: Run cargo fmt
uses: actions-rs/cargo@v1
with:
command: fmt
args: --all -- --check
- uses: amannn/action-semantic-pull-request@v5
env:
CARGO_INCREMENTAL: 1

- name: Run cargo clippy
uses: actions-rs/cargo@v1
with:
command: clippy
args: --all-features --all-targets -- -D warnings -A incomplete-features
env:
CARGO_INCREMENTAL: 1

examples:
name: Examples
runs-on: runs-on,runner=8cpu-linux-x64
env:
CARGO_NET_GIT_FETCH_WITH_CLI: "true"
steps:
- name: Checkout sources
uses: actions/checkout@v2

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

- name: Install SP1 toolchain
run: |
curl -L https://sp1.succinct.xyz | bash
~/.sp1/bin/sp1up
~/.sp1/bin/cargo-prove prove --version
- name: Install SP1 CLI
run: |
cd cli
cargo install --locked --path .
cd ~
- name: Run cargo check
run: |
RUSTFLAGS="-Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0 -C target-cpu=native" \
cargo check --manifest-path examples/Cargo.toml --all-targets --all-features
cli:
name: CLI
runs-on: runs-on,runner=8cpu-linux-x64
env:
CARGO_NET_GIT_FETCH_WITH_CLI: "true"
steps:
- name: Checkout sources
uses: actions/checkout@v2

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

- name: Install SP1 toolchain
run: |
curl -L https://sp1.succinct.xyz | bash
~/.sp1/bin/sp1up
~/.sp1/bin/cargo-prove prove --version
- name: Install SP1 CLI
run: |
cd cli
cargo install --locked --path .
<<<<<<< HEAD
cd ~

- name: Run cargo prove new
run: |
cargo prove new fibonacci
- name: Build program and run script
run: |
cd fibonacci
cd program
cargo prove build
cd ../script
SP1_DEV=1 RUST_LOG=info cargo run --release
=======
cd ~
>>>>>>> dev
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
19 changes: 0 additions & 19 deletions .github/workflows/pr_lint.yml

This file was deleted.

18 changes: 7 additions & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,18 @@ on:
push:
tags:
- "v*.*.*"
schedule:
- cron: "0 0 * * *"
workflow_dispatch:

env:
CARGO_TERM_COLOR: always
IS_NIGHTLY: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}

jobs:
prepare:
name: Prepare release
runs-on: runner=64cpu-linux-arm64
runs-on: ubuntu-latest
timeout-minutes: 30
outputs:
tag_name: ${{ steps.release_info.outputs.tag_name }}
Expand All @@ -30,16 +33,6 @@ jobs:
with:
pull_token: ${{ secrets.PULL_TOKEN }}

- name: Run cargo test
uses: actions-rs/cargo@v1
with:
command: test
toolchain: nightly-2024-04-17
args: -p sp1-sdk --release -- --nocapture
env:
RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0 -C target-cpu=native
RUST_BACKTRACE: 1

- name: Compute release name and tag
id: release_info
run: |
Expand Down Expand Up @@ -75,6 +68,9 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}




release:
name: ${{ matrix.target }} (${{ matrix.runner }})
runs-on: ${{ matrix.runner }}
Expand Down
103 changes: 103 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
name: Tests

on:
push:
branches: [main]
pull_request:
branches:
- "**"
paths:
- "core/**"
- "recursion/**"
- "sdk/**"
- "examples/fibonacci/**"
- ".github/workflows/**"

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
test:
name: SP1 Prover E2E
runs-on: warp-ubuntu-latest-arm64-32x
env:
CARGO_NET_GIT_FETCH_WITH_CLI: "true"
steps:
- name: Checkout sources
uses: actions/checkout@v2

- name: Setup CI
uses: ./.github/actions/setup
with:
pull_token: ${{ secrets.PULL_TOKEN }}

- name: Run cargo test
uses: actions-rs/cargo@v1
with:
command: test
args: -p sp1-prover --release
env:
RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0 -C target-cpu=native
RUST_LOG: info
RUST_BACKTRACE: 1
CARGO_INCREMENTAL: 1
FRI_QUERIES: 1
SP1_DEV: 1

test-main:
name: SP1 Tests
runs-on: warp-ubuntu-latest-arm64-32x
if: github.ref == 'refs/heads/main'
steps:
- name: Checkout sources
uses: actions/checkout@v2

- name: Setup CI
uses: ./.github/actions/setup
with:
pull_token: ${{ secrets.PULL_TOKEN }}

- name: Run cargo test
uses: actions-rs/cargo@v1
with:
command: test
args: -p sp1-core -p sp1-recursion-compiler -p sp1-recursion-program -p sp1-recursion-circuit -p sp1-prover --release
env:
RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0 -C target-cpu=native
RUST_LOG: 1
RUST_BACKTRACE: 1
CARGO_INCREMENTAL: 1
FRI_QUERIES: 1
SP1_DEV: true

lints:
name: Formatting & Clippy
runs-on: warp-ubuntu-latest-arm64-8x
if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"
env:
CARGO_NET_GIT_FETCH_WITH_CLI: "true"
steps:
- name: Checkout sources
uses: actions/checkout@v2

- name: Setup CI
uses: ./.github/actions/setup
with:
pull_token: ${{ secrets.PULL_TOKEN }}

- name: Run cargo fmt
uses: actions-rs/cargo@v1
with:
command: fmt
args: --all -- --check
env:
CARGO_INCREMENTAL: 1

- name: Run cargo clippy
uses: actions-rs/cargo@v1
with:
command: clippy
args: --all-features --all-targets -- -D warnings -A incomplete-features
env:
CARGO_INCREMENTAL: 1
Loading

0 comments on commit 1db2197

Please sign in to comment.