[librsvg/librsvg-2.55: 1/13] CI: only install clippy and rustfmt for the rust-stable container image




commit 269a4076b29a714a820a4f4c30c41e242b62e1f4
Author: Federico Mena Quintero <federico gnome org>
Date:   Tue Sep 6 10:50:43 2022 -0500

    CI: only install clippy and rustfmt for the rust-stable container image
    
    The images for rust-minimum and rust-nightly don't need it, as the
    jobs for clippy and fmt use the stable image.

 ci/container_builds.yml  |  1 +
 ci/install-rust-tools.sh | 11 +++++++++++
 ci/install-rust.sh       |  7 -------
 3 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/ci/container_builds.yml b/ci/container_builds.yml
index 96425c086..8943ef582 100644
--- a/ci/container_builds.yml
+++ b/ci/container_builds.yml
@@ -32,6 +32,7 @@ variables:
     FDO_DISTRIBUTION_TAG: "x86_64-${RUST_STABLE}-${BASE_TAG}"
     FDO_DISTRIBUTION_EXEC: >-
       bash ci/install-rust.sh ${RUST_STABLE} x86_64-unknown-linux-gnu &&
+      bash ci/install-rust-tools.sh &&
       pip3 install gi-docgen sphinx sphinx_rtd_theme
 
 .container.opensuse@x86_64.minimum:
diff --git a/ci/install-rust-tools.sh b/ci/install-rust-tools.sh
new file mode 100644
index 000000000..87c77c1b0
--- /dev/null
+++ b/ci/install-rust-tools.sh
@@ -0,0 +1,11 @@
+source ./ci/env.sh
+
+set -eu
+export CARGO_HOME='/usr/local/cargo'
+
+rustup component add clippy-preview
+rustup component add rustfmt
+# cargo install --force cargo-c
+cargo install --version ^1.0 gitlab_clippy
+# cargo install --force cargo-deny
+# cargo install --force cargo-outdated
diff --git a/ci/install-rust.sh b/ci/install-rust.sh
index 1e1e68172..4921de9d6 100755
--- a/ci/install-rust.sh
+++ b/ci/install-rust.sh
@@ -19,13 +19,6 @@ rustup --version
 cargo --version
 rustc --version
 
-rustup component add clippy-preview
-rustup component add rustfmt
-# cargo install --force cargo-c
-cargo install --version ^1.0 gitlab_clippy
-# cargo install --force cargo-deny
-# cargo install --force cargo-outdated
-
 # Coverage tools
 cargo install grcov
 rustup component add llvm-tools-preview


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]