Skip to content
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
4 changes: 4 additions & 0 deletions .github/workflows/book.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ jobs:

- name: Install toolchain
uses: dtolnay/rust-toolchain@nightly
# `Build docs` below passes `-Zunstable-options`, so this job needs nightly rather than the
# toolchain `rust-toolchain.toml` pins.
- name: Use nightly for this job
run: echo "RUSTUP_TOOLCHAIN=nightly" >> "$GITHUB_ENV"
- uses: Swatinem/rust-cache@v2
with:
cache-on-failure: true
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ jobs:
matrix:
rust: ["1.88", "stable", "nightly"]
flags: ["--no-default-features", "", "--all-features"]
# This matrix is the one place that deliberately compiles on something other than the pinned
# toolchain, so it has to outrank `rust-toolchain.toml`. `RUSTUP_TOOLCHAIN` does; the toolchain
# the install step selects does not.
env:
RUSTUP_TOOLCHAIN: ${{ matrix.rust }}
steps:
- uses: actions/checkout@v5
- uses: dtolnay/rust-toolchain@master
Expand Down
14 changes: 14 additions & 0 deletions rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# The Rust version this fork builds and tests with. It matches the pin in `smr-moonshot`, the
# consumer of these crates, rather than the workspace `rust-version` (1.88.0) that upstream `revm`
# declares as its MSRV: this fork only ever has to compile under Supra's toolchain, and the range of
# compilers that actually build it is narrower than the MSRV suggests.
#
# This file is the only functional pin: rustup prefers it over `rustup default`, so it also decides
# the toolchain in CI, whatever channel a toolchain-install step there names. The jobs that
# genuinely need a different compiler — the MSRV/nightly test matrix, and the book's nightly
# rustdoc — override it with `RUSTUP_TOOLCHAIN`, which rustup ranks above this file.
[toolchain]
channel = "1.97.1"
components = ["clippy", "rust-docs", "rustfmt"]
# `check-no-std` cross-compiles to this target.
targets = ["riscv32imac-unknown-none-elf"]
Loading