diff --git a/.github/actions/bootstrap/action.yml b/.github/actions/bootstrap/action.yml index 61e542a1632..3e07102795c 100644 --- a/.github/actions/bootstrap/action.yml +++ b/.github/actions/bootstrap/action.yml @@ -7,5 +7,7 @@ runs: shell: bash - name: Install rust. uses: ./.github/actions/install_rust + with: + extra-toolchains: nightly-2024-04-29 - name: Install cairo native. uses: ./.github/actions/setup_native_deps diff --git a/.github/actions/install_rust/action.yml b/.github/actions/install_rust/action.yml index b097ef40882..8dbd3e5c414 100644 --- a/.github/actions/install_rust/action.yml +++ b/.github/actions/install_rust/action.yml @@ -1,6 +1,11 @@ -name: Bootsrap rust installation +name: Bootstrap rust installation description: Setup rust environment and its components, also caching the build results. +inputs: + extra-toolchains: + description: "Extra toolchains to install, but aren't used by default" + required: false + runs: using: "composite" steps: @@ -9,6 +14,8 @@ runs: cache-base: main(-v[0-9].*)? inherit-toolchain: true bins: taplo-cli@0.9.0, cargo-machete - channel: nightly-2024-04-29 # Just install for rustfmt, rust-toolchain.toml overrides it. + # Just install for rustfmt, rust-toolchain.toml overrides it. + if: ${{ env.EXTRA_TOOLCHAINS }} + channel: ${{ env.EXTRA_TOOLCHAINS }} env: RUSTFLAGS: "-C link-arg=-fuse-ld=lld"