From 57dcda4a82887827cf830cfd6452aab484a328aa Mon Sep 17 00:00:00 2001 From: Gilad Chase Date: Thu, 19 Dec 2024 07:23:23 +0200 Subject: [PATCH] tmp --- .github/actions/bootstrap/action.yml | 2 ++ .github/actions/install_rust/action.yml | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/actions/bootstrap/action.yml b/.github/actions/bootstrap/action.yml index 61e542a1632..691b5439ad8 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..9ff114e2dea 100644 --- a/.github/actions/install_rust/action.yml +++ b/.github/actions/install_rust/action.yml @@ -1,14 +1,20 @@ -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: + # Install additional non-default toolchains (for rustfmt for example) - uses: moonrepo/setup-rust@v1 with: 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. + channel: ${{ env.INPUT_EXTRA-TOOLCHAINS }} env: RUSTFLAGS: "-C link-arg=-fuse-ld=lld"