summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@gnome.org>2022-09-06 10:57:14 -0500
committerFederico Mena Quintero <federico@gnome.org>2022-09-06 10:57:14 -0500
commit738ee8e3f6988d1f5be371b2b4b4d49c51ca1d93 (patch)
tree13b29c11cfa1585f1b24f8d007cae43d45174628 /ci
parent0da8ff61e7e4c3a366767d81804f4cfe886f80fc (diff)
downloadlibrsvg-738ee8e3f6988d1f5be371b2b4b4d49c51ca1d93.tar.gz
CI: only install grcov in the stable image
Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/741>
Diffstat (limited to 'ci')
-rw-r--r--ci/container_builds.yml1
-rw-r--r--ci/install-grcov.sh8
-rwxr-xr-xci/install-rust.sh4
3 files changed, 9 insertions, 4 deletions
diff --git a/ci/container_builds.yml b/ci/container_builds.yml
index 426dd1a1..72aac9ab 100644
--- a/ci/container_builds.yml
+++ b/ci/container_builds.yml
@@ -33,6 +33,7 @@ variables:
FDO_DISTRIBUTION_EXEC: >-
bash ci/install-rust.sh ${RUST_STABLE} x86_64-unknown-linux-gnu &&
bash ci/install-rust-tools.sh &&
+ bash ci/install-grcov.sh &&
pip3 install gi-docgen sphinx sphinx_rtd_theme
.container.opensuse@x86_64.minimum:
diff --git a/ci/install-grcov.sh b/ci/install-grcov.sh
new file mode 100644
index 00000000..436dc85e
--- /dev/null
+++ b/ci/install-grcov.sh
@@ -0,0 +1,8 @@
+source ./ci/env.sh
+
+set -eu
+export CARGO_HOME='/usr/local/cargo'
+
+# Coverage tools
+cargo install grcov
+rustup component add llvm-tools-preview
diff --git a/ci/install-rust.sh b/ci/install-rust.sh
index 4921de9d..907c6636 100755
--- a/ci/install-rust.sh
+++ b/ci/install-rust.sh
@@ -19,10 +19,6 @@ rustup --version
cargo --version
rustc --version
-# Coverage tools
-cargo install grcov
-rustup component add llvm-tools-preview
-
if [ "$RUST_VERSION" = "nightly" ]; then
# Documentation tools
cargo install --force rustdoc-stripper