diff options
| author | Federico Mena Quintero <federico@gnome.org> | 2022-09-06 10:57:14 -0500 |
|---|---|---|
| committer | Federico Mena Quintero <federico@gnome.org> | 2022-09-08 10:31:44 -0500 |
| commit | 93f1e7a95c78bcee9747050b652a89d5b6f1c4b1 (patch) | |
| tree | 177c0b3d70e037637abfeec1d5602e96cfa32be6 | |
| parent | 7e96d1340ef080e7abc6d48f7882f333c4741f65 (diff) | |
| download | librsvg-93f1e7a95c78bcee9747050b652a89d5b6f1c4b1.tar.gz | |
CI: only install grcov in the stable image
| -rw-r--r-- | ci/container_builds.yml | 1 | ||||
| -rw-r--r-- | ci/install-grcov.sh | 8 | ||||
| -rwxr-xr-x | ci/install-rust.sh | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/ci/container_builds.yml b/ci/container_builds.yml index 8943ef58..80404756 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 |