Skip to content

Version bump for 2.0 release #483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Mar 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions .github/actions/cargo-risczero-install/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,18 @@ runs:
exit 1
fi

# Only run these steps if using ref (building from source)
- name: checkout risc0
if: inputs.ref != ''
uses: actions/checkout@v4
with:
repository: 'risc0/risc0'
path: 'tmp/risc0'
ref: ${{ inputs.ref }}
lfs: true
- name: install active Rust toolchain
if: inputs.ref != ''
run: rustup toolchain install
working-directory: tmp/risc0
shell: bash
# Only run these steps if using ref (building from source)
- name: install cargo-risczero from git
if: inputs.ref != ''
run: cargo install --locked --path risc0/cargo-risczero --no-default-features --features "${{ inputs.features }}"
Expand All @@ -77,18 +75,15 @@ runs:
# Only run this step if using version (installing from crates.io)
- name: install cargo-risczero from crates.io
if: inputs.version != ''
run: cargo install --locked cargo-risczero --version "${{ inputs.version }}" --no-default-features --features "${{ inputs.features }}"
run: cargo install --locked cargo-risczero --version "${{ inputs.version }}" --features "${{ inputs.features }}"
shell: bash
working-directory: tmp/risc0
- name: install rzup
if: inputs.version != ''
run: |
curl -L https://risczero.com/install | bash
echo "$HOME/.risc0/bin" >> $GITHUB_PATH
shell: bash
- name: install r0vm
if: inputs.version != ''
run: rzup install --verbose r0vm ${{ inputs.version }}
shell: bash
- name: install toolchains
if: inputs.version != ''
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ permissions:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
RISC0_TOOLCHAIN_VERSION: 1.81.0
RISC0_MONOREPO_REF: "main"
RISC0_CRATE_VERSION: "2.0.0-rc.1"

jobs:
e2e-tests:
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
- uses: foundry-rs/foundry-toolchain@v1
- uses: ./.github/actions/cargo-risczero-install
with:
ref: ${{ env.RISC0_MONOREPO_REF }}
version: ${{ env.RISC0_CRATE_VERSION }}
toolchain-version: ${{ env.RISC0_TOOLCHAIN_VERSION }}
features: ${{ matrix.feature }}
- name: Setup Kurtosis
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ permissions:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
RISC0_TOOLCHAIN_VERSION: 1.81.0
RISC0_MONOREPO_REF: "main"
RISC0_CRATE_VERSION: "2.0.0-rc.1"
# CARGO_LOCKED is defined as the string '--locked' in PRs targeting release branches and '' elsewhere.
CARGO_LOCKED: ${{ (startsWith(github.base_ref, 'release-') || startsWith(github.base_ref, 'refs/heads/release-')) && '--locked' || '' }}

Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
key: ${{ matrix.os }}-${{ matrix.feature }}
- uses: ./.github/actions/cargo-risczero-install
with:
ref: ${{ env.RISC0_MONOREPO_REF }}
version: ${{ env.RISC0_CRATE_VERSION }}
toolchain-version: ${{ env.RISC0_TOOLCHAIN_VERSION }}
features: ${{ matrix.feature }}
- uses: foundry-rs/foundry-toolchain@v1
Expand Down Expand Up @@ -155,7 +155,7 @@ jobs:
key: ${{ matrix.os }}-${{ matrix.feature }}
- uses: ./.github/actions/cargo-risczero-install
with:
ref: ${{ env.RISC0_MONOREPO_REF }}
version: ${{ env.RISC0_CRATE_VERSION }}
toolchain-version: ${{ env.RISC0_TOOLCHAIN_VERSION }}
features: ${{ matrix.feature }}
- uses: foundry-rs/foundry-toolchain@v1
Expand Down Expand Up @@ -200,7 +200,7 @@ jobs:
key: ${{ matrix.os }}-${{ matrix.feature }}
- uses: ./.github/actions/cargo-risczero-install
with:
ref: ${{ env.RISC0_MONOREPO_REF }}
version: ${{ env.RISC0_CRATE_VERSION }}
toolchain-version: ${{ env.RISC0_TOOLCHAIN_VERSION }}
features: ${{ matrix.feature }}
- uses: foundry-rs/foundry-toolchain@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/steel-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ concurrency:

env:
RISC0_TOOLCHAIN_VERSION: r0.1.81.0
RISC0_MONOREPO_REF: "main"
RISC0_CRATE_VERSION: "2.0.0-rc.1"

jobs:
build:
Expand Down
5 changes: 0 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,3 @@ out/

# Ignore the file with RPC and Etherscan API keys for deployment.
deployment_secrets.toml

# We ignore lock files in this repository on main because we want to
# continually track and develop against risc0 main. When lock files are
# tracked, CI will pin to a commit and only rarely update.
Cargo.lock
Loading
Loading