Skip to content

Revert "WEB3-462: Migrate CI to cluster" / Pin Actions #619

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 10 commits into from
Jun 11, 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
19 changes: 10 additions & 9 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ permissions:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
RISC0_TOOLCHAIN_VERSION: 1.85.0
FOUNDRY_VERSION: v1.2.2
FOUNDRY_VERSION: v1.0.0
RISC0_MONOREPO_REF: "main"

jobs:
e2e-tests:
runs-on: [ self-hosted, cluster, "${{ matrix.os }}", "${{ matrix.device }}" ]
runs-on: [ self-hosted, prod, "${{ matrix.os }}", "${{ matrix.device }}" ]
strategy:
fail-fast: false
matrix:
Expand All @@ -34,14 +34,12 @@ jobs:
include:
- os: Linux
feature: cuda
device: nvidia_rtx_4000_ada
nvcc_arch: sm_89
device: nvidia_rtx_a5000
# Exclude Bonsai proving on non-release branches.
exclude:
- release: false
prover: bonsai
env:
NVCC_APPEND_FLAGS: -arch=${{ matrix.nvcc_arch }}
RUST_BACKTRACE: full
steps:
# This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
Expand All @@ -64,9 +62,9 @@ jobs:
env:
DOCKERHUB_USER: ${{ secrets.DOCKERHUB_CI_USER }}
- if: matrix.feature == 'cuda'
uses: risc0/risc0/.github/actions/cuda@352dea62857ba57331053cd0986a12c1a4708732
- uses: risc0/risc0/.github/actions/rustup@352dea62857ba57331053cd0986a12c1a4708732
- uses: risc0/risc0/.github/actions/sccache@352dea62857ba57331053cd0986a12c1a4708732
uses: risc0/risc0/.github/actions/cuda@fbe1d0bb75c21fe36cefd87bae25f424b711b291
- uses: risc0/risc0/.github/actions/rustup@fbe1d0bb75c21fe36cefd87bae25f424b711b291
- uses: risc0/risc0/.github/actions/sccache@fbe1d0bb75c21fe36cefd87bae25f424b711b291
with:
key: ${{ matrix.os }}-${{ matrix.feature }}
- name: Install Foundry
Expand All @@ -78,8 +76,11 @@ jobs:
ref: ${{ env.RISC0_MONOREPO_REF }}
toolchain-version: ${{ env.RISC0_TOOLCHAIN_VERSION }}
features: ${{ matrix.feature }}
- name: Configure Kurtosis
- name: Install Kurtosis
run: |
echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
sudo apt update
sudo apt install kurtosis-cli
kurtosis analytics disable
echo "$(dirname $(which kurtosis))" >> $GITHUB_PATH
shell: bash
Expand Down
49 changes: 29 additions & 20 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.85.0
FOUNDRY_VERSION: v1.2.2
FOUNDRY_VERSION: v1.0.0
RISC0_MONOREPO_REF: "main"
# 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 All @@ -40,13 +40,20 @@ jobs:
run: exit 1

check:
runs-on: ubuntu-latest
runs-on: [ self-hosted, prod, "${{ matrix.os }}", "${{ matrix.device }}" ]
strategy:
# Run only on Linux with CPU.
matrix:
include:
- os: Linux
feature: default
device: cpu
steps:
- uses: actions/checkout@v4
with:
# Full history is required by license-check.py
fetch-depth: 0
- uses: risc0/risc0/.github/actions/rustup@352dea62857ba57331053cd0986a12c1a4708732
- uses: risc0/risc0/.github/actions/rustup@fbe1d0bb75c21fe36cefd87bae25f424b711b291
- name: Install cargo-sort
uses: risc0/cargo-install@b9307573043522ab0d3e3be64a51763b765b52a4
with:
Expand Down Expand Up @@ -81,7 +88,7 @@ jobs:
[ "$(grep -re 'DO[_ ]\?NOT[_ ]\?MERGE' $(git ls-tree --full-tree --name-only -r HEAD) | tee /dev/fd/2 | wc -l)" -eq "0" ]

clippy:
runs-on: [ self-hosted, cluster, "${{ matrix.os }}", "${{ matrix.device }}" ]
runs-on: [ self-hosted, prod, "${{ matrix.os }}", "${{ matrix.device }}" ]
strategy:
# Run only on Linux with CPU.
matrix:
Expand All @@ -95,8 +102,10 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: risc0/risc0/.github/actions/rustup@352dea62857ba57331053cd0986a12c1a4708732
- uses: risc0/risc0/.github/actions/sccache@352dea62857ba57331053cd0986a12c1a4708732
- if: matrix.feature == 'cuda'
uses: risc0/risc0/.github/actions/cuda@fbe1d0bb75c21fe36cefd87bae25f424b711b291
- uses: risc0/risc0/.github/actions/rustup@fbe1d0bb75c21fe36cefd87bae25f424b711b291
- uses: risc0/risc0/.github/actions/sccache@fbe1d0bb75c21fe36cefd87bae25f424b711b291
with:
key: ${{ matrix.os }}-${{ matrix.feature }}
- uses: ./.github/actions/cargo-risczero-install
Expand Down Expand Up @@ -129,7 +138,7 @@ jobs:
- run: sccache --show-stats

test-risc0-ethereum:
runs-on: [ self-hosted, cluster, "${{ matrix.os }}", "${{ matrix.device }}" ]
runs-on: [ self-hosted, prod, "${{ matrix.os }}", "${{ matrix.device }}" ]
strategy:
fail-fast: false
matrix:
Expand All @@ -139,16 +148,14 @@ jobs:
device: cpu
- os: Linux
feature: cuda
device: nvidia_rtx_4000_ada
nvcc_arch: sm_89
device: nvidia_rtx_a5000
- os: macOS
feature: default
device: apple_m2_pro
env:
FEATURE: ${{ matrix.feature }}
ETH_RPC_URL: https://eth-mainnet.g.alchemy.com/v2/${{ secrets.ALCHEMY_RISC0_ETH_API_KEY }}
BEACON_API_URL: https://ethereum-beacon-api.publicnode.com
NVCC_APPEND_FLAGS: -arch=${{ matrix.nvcc_arch }}
RUST_BACKTRACE: full
steps:
# This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
Expand All @@ -157,9 +164,9 @@ jobs:
with:
submodules: recursive
- if: matrix.feature == 'cuda'
uses: risc0/risc0/.github/actions/cuda@352dea62857ba57331053cd0986a12c1a4708732
- uses: risc0/risc0/.github/actions/rustup@352dea62857ba57331053cd0986a12c1a4708732
- uses: risc0/risc0/.github/actions/sccache@352dea62857ba57331053cd0986a12c1a4708732
uses: risc0/risc0/.github/actions/cuda@fbe1d0bb75c21fe36cefd87bae25f424b711b291
- uses: risc0/risc0/.github/actions/rustup@fbe1d0bb75c21fe36cefd87bae25f424b711b291
- uses: risc0/risc0/.github/actions/sccache@fbe1d0bb75c21fe36cefd87bae25f424b711b291
with:
key: ${{ matrix.os }}-${{ matrix.feature }}
- uses: ./.github/actions/cargo-risczero-install
Expand Down Expand Up @@ -188,7 +195,7 @@ jobs:
- run: sccache --show-stats

examples:
runs-on: [ self-hosted, cluster, "${{ matrix.os }}", "${{ matrix.device }}" ]
runs-on: [ self-hosted, prod, "${{ matrix.os }}", "${{ matrix.device }}" ]
strategy:
# Run only on Linux with CPU. Additional coverage is marginal.
matrix:
Expand All @@ -204,8 +211,10 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: risc0/risc0/.github/actions/rustup@352dea62857ba57331053cd0986a12c1a4708732
- uses: risc0/risc0/.github/actions/sccache@352dea62857ba57331053cd0986a12c1a4708732
- if: matrix.feature == 'cuda'
uses: risc0/risc0/.github/actions/cuda@fbe1d0bb75c21fe36cefd87bae25f424b711b291
- uses: risc0/risc0/.github/actions/rustup@fbe1d0bb75c21fe36cefd87bae25f424b711b291
- uses: risc0/risc0/.github/actions/sccache@fbe1d0bb75c21fe36cefd87bae25f424b711b291
with:
key: ${{ matrix.os }}-${{ matrix.feature }}
- uses: ./.github/actions/cargo-risczero-install
Expand Down Expand Up @@ -237,14 +246,14 @@ jobs:
- run: sccache --show-stats

doc:
runs-on: [ self-hosted, cluster, macOS, cpu ]
runs-on: [ self-hosted, prod, macOS, cpu ]
steps:
# This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
- run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: risc0/risc0/.github/actions/rustup@352dea62857ba57331053cd0986a12c1a4708732
- uses: risc0/risc0/.github/actions/rustup@fbe1d0bb75c21fe36cefd87bae25f424b711b291
- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1
with:
Expand All @@ -259,12 +268,12 @@ jobs:
# Run as a separate job because we need to install a different set of tools.
# In particular, it uses nightly Rust and _does not_ install Forge or cargo risczero.
docs-rs:
runs-on: [ self-hosted, cluster, macOS, cpu ]
runs-on: [ self-hosted, prod, macOS, cpu ]
steps:
# This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
- run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
- uses: actions/checkout@v4
- uses: risc0/risc0/.github/actions/rustup@352dea62857ba57331053cd0986a12c1a4708732
- uses: risc0/risc0/.github/actions/rustup@fbe1d0bb75c21fe36cefd87bae25f424b711b291
with:
# Building with docs.rs config requires the nightly toolchain.
toolchain: nightly-2025-02-20
Expand Down
Loading