Skip to content

Commit

Permalink
Update zkvm to 1.3.0-rc.1 (#146)
Browse files Browse the repository at this point in the history
* update

* update ci

* use rzup

* hardcode values

* typo

* install 1.81

* add missing install

* remove cargo-risczero

* don't specify package
  • Loading branch information
rlukata authored Feb 25, 2025
1 parent 8e5663a commit 6a91678
Show file tree
Hide file tree
Showing 11 changed files with 866 additions and 290 deletions.
32 changes: 10 additions & 22 deletions .github/actions/risczero/action.yml
Original file line number Diff line number Diff line change
@@ -1,32 +1,20 @@
name: risczero toolchain install
description: Install risczero toolchain

inputs:
version:
description: 'Version of the RISC Zero to install'
required: true
type: string
toolchain-version:
description: 'Version of the RISC Zero toolchains to install'
required: false
default: ''
type: string

runs:
using: composite
steps:
- uses: risc0/cargo-install@v3
with:
crate: cargo-binstall
version: '=1.6'
locked: true

- run: cargo binstall -y --force cargo-risczero@${{ inputs.version }}
shell: bash
- name: install rust
uses: risc0/risc0/.github/actions/rustup@release-1.3

- run: cargo risczero install ${{ inputs.toolchain-version != '' && format('--version {0}', inputs.toolchain-version) || '' }}
- name: Install rzup
env:
ENV_PATH: test
shell: bash
run: |
curl -L https://risczero.com/install | bash
echo "$HOME/.risc0/bin" >> $GITHUB_PATH
- name: test risczero
- name: rzup install rust
shell: bash
run: cargo risczero --version
run: rzup install
8 changes: 0 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ permissions:
env:
CARGO_TERM_COLOR: always
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
RISC0_VERSION: "1.1.3"
RISC0_TOOLCHAIN_VERSION: "r0.1.81.0"

jobs:
test:
Expand All @@ -30,9 +28,6 @@ jobs:
- uses: risc0/risc0/.github/actions/rustup@main
- uses: risc0/risc0/.github/actions/sccache@main
- uses: ./.github/actions/risczero
with:
version: ${{ env.RISC0_VERSION }}
toolchain-version: ${{ env.RISC0_TOOLCHAIN_VERSION }}
- run: cargo test --all-targets -p zeth-core -p zeth-guests -p zeth-preflight -p zeth -p zeth-benchmark -F debug-guest-build
- run: cargo test --all-targets -p zeth-core-ethereum -p zeth-preflight-ethereum -p zeth-ethereum -F debug-guest-build
- run: cargo test --all-targets -p zeth-core-optimism -p zeth-preflight-optimism -p zeth-optimism -F debug-guest-build
Expand All @@ -48,9 +43,6 @@ jobs:
- uses: risc0/risc0/.github/actions/rustup@main
- uses: risc0/risc0/.github/actions/sccache@main
- uses: ./.github/actions/risczero
with:
version: ${{ env.RISC0_VERSION }}
toolchain-version: ${{ env.RISC0_TOOLCHAIN_VERSION }}
- run: cargo test --all-targets -p zeth-testeth -F ef-tests

clippy:
Expand Down
Loading

0 comments on commit 6a91678

Please sign in to comment.