diff --git a/.github/workflows/ci-build-test-reusable.yml b/.github/workflows/ci-build-test-reusable.yml index 6f706bea..09a91f67 100644 --- a/.github/workflows/ci-build-test-reusable.yml +++ b/.github/workflows/ci-build-test-reusable.yml @@ -1,56 +1,56 @@ name: CI Build and Test - Reusable on: - workflow_call: - inputs: - version_name: - type: string - required: true - version_toolchain: - type: string - required: true + workflow_call: + inputs: + version_name: + type: string + required: true + version_toolchain: + type: string + required: true env: CARGO_TERM_COLOR: always GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} jobs: - build-test: - name: Build and test - runs-on: [taiko-runner] - timeout-minutes: 120 - - env: - TARGET: ${{ inputs.version_name}} - CI: 1 - MOCK: 1 - - steps: - - uses: actions/checkout@v4 - with: - submodules: recursive - - - uses: actions-rs/toolchain@v1 - with: - toolchain: ${{ inputs.version_toolchain }} - profile: minimal - - - name: Install cargo-binstall - uses: cargo-bins/cargo-binstall@v1.6.4 - - - name: Setup sccache - if: ${{ inputs.version_name }} == risc0 - uses: risc0/risc0/.github/actions/sccache@release-0.19 - - - name: Install ${{ inputs.version_name }} - run: make install - - - name: Build ${{ inputs.version_name }} prover - run: make build - - - name: Test ${{ inputs.version_name }} prover - run: make test - - - name: Build with tracer - if: ${{ inputs.version_name }} == native - run: cargo build -F tracer + build-test: + name: Build and test + runs-on: [taiko-runner] + timeout-minutes: 120 + + env: + TARGET: ${{ inputs.version_name }} + CI: 1 + MOCK: 1 + + steps: + - uses: actions/checkout@v4 + with: + submodules: recursive + + - uses: actions-rs/toolchain@v1 + with: + toolchain: ${{ inputs.version_toolchain }} + profile: minimal + + - name: Install cargo-binstall + uses: cargo-bins/cargo-binstall@v1.6.4 + + - name: Setup sccache + if: ${{ inputs.version_name }} == risc0 + uses: risc0/risc0/.github/actions/sccache@release-0.19 + + - name: Install ${{ inputs.version_name }} + run: make install + + - name: Build ${{ inputs.version_name }} prover + run: make build + + - name: Test ${{ inputs.version_name }} prover + run: make test + + - name: Build with tracer + if: ${{ inputs.version_name }} == native + run: cargo build -F tracer diff --git a/makefile b/makefile index 8a50b879..5b9c88f8 100644 --- a/makefile +++ b/makefile @@ -16,4 +16,5 @@ fmt: @cargo fmt --all --check clippy: + ./script/install.sh $(TARGET) ./script/clippy.sh $(TARGET) diff --git a/provers/risc0/builder/src/main.rs b/provers/risc0/builder/src/main.rs index 81803a21..b0de9edb 100644 --- a/provers/risc0/builder/src/main.rs +++ b/provers/risc0/builder/src/main.rs @@ -62,7 +62,7 @@ impl Pipeline for Risc0Pipeline { .execute() .expect("Execution failed") .risc0_placement(dest) - .expect("Failed to export Sp1 artifacts"); + .expect("Failed to export Risc0 artifacts"); } fn tests(&self, names: &[&str], dest: &str) { @@ -81,6 +81,6 @@ impl Pipeline for Risc0Pipeline { .execute() .expect("Execution failed") .risc0_placement(dest) - .expect("Failed to export Sp1 artifacts"); + .expect("Failed to export Risc0 artifacts"); } }