diff options
| author | Federico Mena Quintero <federico@gnome.org> | 2022-09-06 10:50:43 -0500 |
|---|---|---|
| committer | Federico Mena Quintero <federico@gnome.org> | 2022-09-08 10:31:39 -0500 |
| commit | 269a4076b29a714a820a4f4c30c41e242b62e1f4 (patch) | |
| tree | fe43c361382d9e8685b9ad07c6ae58856415ea61 | |
| parent | 0613ce1164a274df1fc22cc49aacf3cc817e1929 (diff) | |
| download | librsvg-269a4076b29a714a820a4f4c30c41e242b62e1f4.tar.gz | |
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.
| -rw-r--r-- | ci/container_builds.yml | 1 | ||||
| -rw-r--r-- | ci/install-rust-tools.sh | 11 | ||||
| -rwxr-xr-x | 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 96425c08..8943ef58 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 00000000..87c77c1b --- /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 1e1e6817..4921de9d 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 |