[librsvg: 2/10] CI: only install clippy and rustfmt for the rust-stable container image
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 2/10] CI: only install clippy and rustfmt for the rust-stable container image
- Date: Tue, 6 Sep 2022 19:38:46 +0000 (UTC)
commit d1696614bb983fc9e5f56da001dc301e5ca017cb
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.
Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/741>
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 1e6bcd3d3..426dd1a19 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]