From ea66d72ee901faa48f99eab96fa634295807d33f Mon Sep 17 00:00:00 2001 From: Wolfgang Welz Date: Tue, 12 Dec 2023 19:39:39 +0100 Subject: [PATCH] Update CI (#60) * Update and fix CI * fix cargo-install version * try without cache * Revert "try without cache" This reverts commit d91547ab1697989050cfdfce35229e8899b0b27f. * add GITHUB_TOKEN * review suggestions * make version env --- .github/workflows/ci.yml | 46 ++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 38f96b0fc..f85cf751d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,6 +7,9 @@ on: env: CARGO_TERM_COLOR: always + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + RISC0_VERSION: 0.19.1 + RISC0_TOOLCHAIN_VERSION: test-release-2 concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} @@ -18,36 +21,37 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 60 steps: - - uses: actions/checkout@v3 - with: - submodules: recursive - - uses: risc0/risc0/.github/actions/rustup@release-0.18 - - uses: risc0/risc0/.github/actions/sccache@release-0.18 - # - run: cargo install cargo-risczero && cargo risczero install - - run: cargo test --workspace --all-targets --all-features --exclude sgx-ra + - uses: actions/checkout@v4 + with: + submodules: recursive + - uses: risc0/risc0/.github/actions/rustup@release-0.19 + - uses: risc0/risc0/.github/actions/sccache@release-0.19 + - uses: risc0/cargo-install@v1 + with: + crate: cargo-binstall + - run: cargo binstall -y --force cargo-risczero@${{ env.RISC0_VERSION }} + - run: cargo risczero install --version $RISC0_TOOLCHAIN_VERSION + - run: cargo test --workspace --all-targets --all-features clippy: name: clippy runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@v3 - with: - submodules: recursive - - uses: risc0/risc0/.github/actions/rustup@release-0.18 - - uses: risc0/risc0/.github/actions/sccache@release-0.18 - - uses: risc0/clippy-action@main - with: - reporter: "github-pr-check" - fail_on_error: true - github_token: ${{ secrets.GITHUB_TOKEN }} - clippy_flags: --workspace --all-targets --all-features -- -Dwarnings + - uses: actions/checkout@v4 + - uses: risc0/risc0/.github/actions/rustup@release-0.19 + - uses: risc0/risc0/.github/actions/sccache@release-0.19 + - uses: risc0/clippy-action@main + with: + reporter: 'github-pr-check' + fail_on_error: true + clippy_flags: --workspace --all-targets --all-features -- -Dwarnings fmt: name: fmt runs-on: ubuntu-latest timeout-minutes: 10 steps: - - uses: actions/checkout@v3 - - uses: risc0/risc0/.github/actions/rustup@release-0.18 - - run: cargo fmt --all --check + - uses: actions/checkout@v4 + - uses: risc0/risc0/.github/actions/rustup@release-0.19 + - run: cargo fmt --all --check