Skip to content
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

Backport commits to release-0.19 #1122

Merged
merged 18 commits into from
Nov 8, 2023
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/bench_applications.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
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@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/rustup
- uses: ./.github/actions/sccache
with:
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:

steps:
- name: Checkout gh-pages repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: risc0/ghpages
ref: dev
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/bench_datasheet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
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@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/rustup
- uses: ./.github/actions/sccache
with:
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:

steps:
- name: Checkout gh-pages repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: risc0/ghpages
ref: dev
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bench_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
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@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/rustup
- uses: ./.github/actions/sccache
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bench_trends.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
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@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/rustup
- uses: ./.github/actions/sccache
with:
Expand Down
43 changes: 34 additions & 9 deletions .github/workflows/bonsai.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on:
merge_group:
pull_request:
branches: [main, "release-*"]
paths-ignore:
- "website/**"
workflow_dispatch:

concurrency:
Expand All @@ -15,31 +13,56 @@ concurrency:
env:
RISC0_BUILD_LOCKED: 1
RISC0_TOOLCHAIN_VERSION: test-release-2
RUSTC_WRAPPER: sccache

jobs:
changes:
runs-on: ubuntu-latest
permissions:
pull-requests: read
outputs:
bonsai: ${{ steps.filter.outputs.bonsai }}
steps:
- uses: actions/checkout@v4
- uses: risc0/paths-filter@4067d885736b84de7c414f582ac45897079b0a78
id: filter
with:
filters: |
bonsai:
- .github/**
- bonsai/**
- risc0/**

bonsai:
if: needs.changes.outputs.bonsai == 'true'
needs: changes
runs-on: [self-hosted, prod, Linux, cpu]
steps:
# This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
- name: checkout dummy commit (submodule bug workaround)
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) || :"

- name: checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive

# Install dependencies.
- name: install rust
uses: ./.github/actions/rustup

- run: cargo run --bin cargo-risczero --no-default-features -- risczero install --version $RISC0_TOOLCHAIN_VERSION
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: ./.github/actions/rustup
- uses: ./.github/actions/sccache
with:
key: Linux-default

- name: Install Foundry
uses: risc0/foundry-toolchain@2fe7e70b520f62368a0e3c464f997df07ede420f

- name: Cargo install cargo-risczero
run: cargo install --force --path risc0/cargo-risczero

- run: cargo risczero install --version $RISC0_TOOLCHAIN_VERSION
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

# Lint
- name: check solidity code formatting in bonsai/ethereum
run: forge fmt --check
Expand Down Expand Up @@ -73,3 +96,5 @@ jobs:
TEST_USE_ZKVM: true
run: forge test -vvv
working-directory: bonsai/examples/governance

- run: sccache --show-stats
4 changes: 2 additions & 2 deletions .github/workflows/ghpages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
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@v3
- uses: actions/checkout@v4
- name: Upload gh-pages
uses: actions/upload-artifact@v2
with:
Expand All @@ -43,7 +43,7 @@ jobs:

steps:
- name: Checkout gh-pages repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: risc0/ghpages
ref: dev
Expand Down