Skip to content

Commit

Permalink
chore(clippy): install tools before running clippy
Browse files Browse the repository at this point in the history
  • Loading branch information
petarvujovic98 committed Jun 17, 2024
1 parent 37efcff commit 4e163f4
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 49 deletions.
94 changes: 47 additions & 47 deletions .github/workflows/ci-build-test-reusable.yml
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@ fmt:
@cargo fmt --all --check

clippy:
./script/install.sh $(TARGET)
./script/clippy.sh $(TARGET)
4 changes: 2 additions & 2 deletions provers/risc0/builder/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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");
}
}

0 comments on commit 4e163f4

Please sign in to comment.