File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 3232 xpm install @xpack-dev-tools/riscv-none-elf-gcc@latest --global --verbose
3333 echo 'export PATH=$HOME/.local/xPacks/@xpack-dev-tools/riscv-none-elf-gcc/15.2.0-1.1/.content/bin:$PATH' >> ~/.bashrc
3434 echo "PATH=$HOME/.local/xPacks/@xpack-dev-tools/riscv-none-elf-gcc/15.2.0-1.1/.content/bin:$PATH" >> $GITHUB_ENV
35- # Rust is needed by `make eest-rlp-build` (z6m_eest_convert converter).
36- # rustup auto-installs the toolchain in prover/rust-toolchain.toml on
37- # the first cargo invocation, so no --default-toolchain pin here.
38- curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none --profile minimal
39- echo "$HOME/.cargo/bin" >> $GITHUB_PATH
4035
4136 - name : Verify tool versions
4237 run : |
5045 ctest --version
5146 qemu-system-riscv64 --version
5247
48+ - name : Install Rust toolchain
49+ env :
50+ CARGO_HOME : /opt/cargo
51+ RUSTUP_HOME : /opt/rustup
52+ # cargo is needed by `make eest-rlp-build` (z6m_eest_convert).
53+ # CARGO_HOME/RUSTUP_HOME are pinned to /opt so rustup-init does not
54+ # trip on the container's HOME vs euid-home mismatch. The toolchain
55+ # itself is resolved from prover/rust-toolchain.toml on first call.
56+ run : |
57+ mkdir -p "$CARGO_HOME" "$RUSTUP_HOME"
58+ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --default-toolchain none --profile minimal
59+ echo "CARGO_HOME=$CARGO_HOME" >> $GITHUB_ENV
60+ echo "RUSTUP_HOME=$RUSTUP_HOME" >> $GITHUB_ENV
61+ echo "$CARGO_HOME/bin" >> $GITHUB_PATH
62+
5363 - name : Checkout repository
5464 uses : actions/checkout@v4
5565 with :
Original file line number Diff line number Diff line change 3232 xpm install @xpack-dev-tools/riscv-none-elf-gcc@latest --global --verbose
3333 echo 'export PATH=$HOME/.local/xPacks/@xpack-dev-tools/riscv-none-elf-gcc/15.2.0-1.1/.content/bin:$PATH' >> ~/.bashrc
3434 echo "PATH=$HOME/.local/xPacks/@xpack-dev-tools/riscv-none-elf-gcc/15.2.0-1.1/.content/bin:$PATH" >> $GITHUB_ENV
35- # Rust is needed by `make eest-rlp-build` (z6m_eest_convert converter).
36- # rustup auto-installs the toolchain in prover/rust-toolchain.toml on
37- # the first cargo invocation, so no --default-toolchain pin here.
38- curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none --profile minimal
39- echo "$HOME/.cargo/bin" >> $GITHUB_PATH
4035
4136 - name : Verify tool versions
4237 run : |
5045 ctest --version
5146 qemu-system-riscv32 --version
5247
48+ - name : Install Rust toolchain
49+ env :
50+ CARGO_HOME : /opt/cargo
51+ RUSTUP_HOME : /opt/rustup
52+ # cargo is needed by `make eest-rlp-build` (z6m_eest_convert).
53+ # CARGO_HOME/RUSTUP_HOME are pinned to /opt so rustup-init does not
54+ # trip on the container's HOME vs euid-home mismatch. The toolchain
55+ # itself is resolved from prover/rust-toolchain.toml on first call.
56+ run : |
57+ mkdir -p "$CARGO_HOME" "$RUSTUP_HOME"
58+ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --default-toolchain none --profile minimal
59+ echo "CARGO_HOME=$CARGO_HOME" >> $GITHUB_ENV
60+ echo "RUSTUP_HOME=$RUSTUP_HOME" >> $GITHUB_ENV
61+ echo "$CARGO_HOME/bin" >> $GITHUB_PATH
62+
5363 - name : Checkout repository
5464 uses : actions/checkout@v4
5565 with :
You can’t perform that action at this time.
0 commit comments