[at-spi2-core: 4/5] Sigh, install grcov in the correct path
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [at-spi2-core: 4/5] Sigh, install grcov in the correct path
- Date: Thu, 7 Jul 2022 00:39:12 +0000 (UTC)
commit dc6f433add06a473e153f0da647289d263570e76
Author: Federico Mena Quintero <federico gnome org>
Date: Wed Jul 6 19:15:39 2022 -0500
Sigh, install grcov in the correct path
Also, do it in the install-rust script; no need to have a separate one
for grcov - since it is built from source, we need a Rust installation anyway.
ci/container_builds.yml | 5 ++---
ci/install-grcov.sh | 5 -----
ci/install-rust.sh | 1 +
3 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/ci/container_builds.yml b/ci/container_builds.yml
index c5635be4..359c1b97 100644
--- a/ci/container_builds.yml
+++ b/ci/container_builds.yml
@@ -13,7 +13,7 @@ include:
variables:
# When branching change the suffix to avoid conflicts with images
# from the main branch
- BASE_TAG: "2022-07-06.1-main"
+ BASE_TAG: "2022-07-06.2-main"
RUST_STABLE: "1.58.1"
.container.opensuse@x86_64:
@@ -29,8 +29,7 @@ variables:
libxkbcommon-devel libXi-devel libXtst-devel lcov meson ninja
python310 python310-python-dbusmock python310-gobject tar wget
FDO_DISTRIBUTION_EXEC: >-
- bash ci/install-rust.sh ${RUST_STABLE} x86_64-unknown-linux-gnu &&
- bash ci/install-grcov.sh
+ bash ci/install-rust.sh ${RUST_STABLE} x86_64-unknown-linux-gnu
opensuse-container@x86_64:
extends:
diff --git a/ci/install-rust.sh b/ci/install-rust.sh
index 6e9dd379..dab77119 100644
--- a/ci/install-rust.sh
+++ b/ci/install-rust.sh
@@ -23,3 +23,4 @@ rustup component add clippy-preview
rustup component add rustfmt
# cargo install --force cargo-c
cargo install --version ^1.0 gitlab_clippy
+cargo install grcov
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]