From e0fb0f8141968ce152995be1e274c6f97c9492ed Mon Sep 17 00:00:00 2001 From: STEVAN Antoine <antoine.stevan@isae-supaero.fr> Date: Thu, 21 Mar 2024 12:48:34 +0000 Subject: [PATCH] fix the installation of Rust in the CI (dragoon/komodo!42) !39 and !40 changed the CI to use a _toolchain_ file. however, having `default` as the `$.profile` causes extra useless components to be installed. this MR sets the `$.profile` to `minimal` in the _toolchain_ file and the `$.components` to `rustfmt` and `clippy`. --- .gitlab-ci.yml | 4 ---- rust-toolchain.toml | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 260ef505..c4b94faf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,8 +19,6 @@ workflow: fmt: stage: fmt - before_script: - - rustup component add rustfmt script: - make fmt @@ -34,8 +32,6 @@ test: - apt upgrade --yes - apt install protobuf-compiler --yes - - rustup component add clippy - - export NUSHELL_BUILD="nu-$NUSHELL_VERSION-$NUSHELL_ARCH" - export PATH="/tmp/:$PATH" diff --git a/rust-toolchain.toml b/rust-toolchain.toml index f20bfb3f..a6c0bd22 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,4 @@ [toolchain] -profile = "default" +profile = "minimal" channel = "1.75" +components = ["rustfmt", "clippy"] -- GitLab