Skip to content

Commit

Permalink
Update to zkVM 0.21 (#104)
Browse files Browse the repository at this point in the history
* Update to zkVM 0.21

* (Attempt to) fix executor ef-test

* update CI to 0.21 and latest toolchain

* fix warnings

* Update lib/src/host/preflight.rs

Co-authored-by: Wolfgang Welz <[email protected]>

---------

Co-authored-by: Wolfgang Welz <[email protected]>
  • Loading branch information
intoverflow and Wollac committed Mar 25, 2024
1 parent d131901 commit a919671
Show file tree
Hide file tree
Showing 19 changed files with 550 additions and 435 deletions.
29 changes: 17 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,21 @@ on:
branches: [ "main" ]
pull_request:

env:
CARGO_TERM_COLOR: always
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
RISC0_VERSION: 0.20.1
RISC0_TOOLCHAIN_VERSION: test-release-2

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

# this is needed to gain access via OIDC to the S3 bucket for caching
permissions:
id-token: write
contents: read

env:
CARGO_TERM_COLOR: always
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
RISC0_VERSION: "^0.21"
RISC0_TOOLCHAIN_VERSION: v2024-02-08.1

jobs:
test:
name: test
Expand All @@ -24,12 +29,12 @@ jobs:
- 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/risc0/.github/actions/rustup@release-0.21
- uses: risc0/risc0/.github/actions/sccache@release-0.21
- uses: risc0/cargo-install@v1
with:
crate: cargo-binstall
- run: cargo binstall -y --force cargo-risczero@${{ env.RISC0_VERSION }}
- run: cargo binstall -y --force cargo-risczero@$RISC0_VERSION
- run: cargo risczero install --version $RISC0_TOOLCHAIN_VERSION
- run: cargo test --workspace --all-targets -F ef-tests,debug-guest-build

Expand All @@ -39,8 +44,8 @@ jobs:
timeout-minutes: 30
steps:
- uses: actions/checkout@v4
- uses: risc0/risc0/.github/actions/rustup@release-0.19
- uses: risc0/risc0/.github/actions/sccache@release-0.19
- uses: risc0/risc0/.github/actions/rustup@release-0.21
- uses: risc0/risc0/.github/actions/sccache@release-0.21
- uses: risc0/clippy-action@main
with:
reporter: 'github-pr-check'
Expand All @@ -53,5 +58,5 @@ jobs:
timeout-minutes: 10
steps:
- uses: actions/checkout@v4
- uses: risc0/risc0/.github/actions/rustup@release-0.19
- uses: risc0/risc0/.github/actions/rustup@release-0.21
- run: cargo fmt --all --check
Loading

0 comments on commit a919671

Please sign in to comment.