From 6a5d15d61374292f244b235316dea5f83a2f0ca7 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Mon, 26 Sep 2022 15:01:07 -0500 Subject: CI: do not install gi-docgen on non-opensuse distros It's not used there. Part-of: --- ci/container_builds.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/ci/container_builds.yml b/ci/container_builds.yml index 4f5a0ee1..9ddcf692 100644 --- a/ci/container_builds.yml +++ b/ci/container_builds.yml @@ -6,7 +6,7 @@ include: variables: # When branching change the suffix to avoid conflicts with images # from the main branch - BASE_TAG: "2022-09-26.3-main" + BASE_TAG: "2022-09-26.4-main" RUST_STABLE: "1.64.0" RUST_MINIMUM: "1.58.1" @@ -143,16 +143,14 @@ opensuse-container@aarch64: 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 && - pip3 install gi-docgen + bash ci/install-rust.sh ${RUST_STABLE} x86_64-unknown-linux-gnu .container.fedora@aarch64: extends: .container.fedora@common variables: FDO_DISTRIBUTION_TAG: "aarch64-${RUST_STABLE}-${BASE_TAG}" FDO_DISTRIBUTION_EXEC: >- - bash ci/install-rust.sh ${RUST_STABLE} aarch64-unknown-linux-gnu && - pip3 install gi-docgen + bash ci/install-rust.sh ${RUST_STABLE} aarch64-unknown-linux-gnu tags: - aarch64 @@ -208,16 +206,14 @@ fedora-container@x86_64: 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 && - pip3 install gi-docgen + bash ci/install-rust.sh ${RUST_STABLE} x86_64-unknown-linux-gnu .container.debian@aarch64: extends: .container.debian@common variables: FDO_DISTRIBUTION_TAG: "aarch64-${RUST_STABLE}-${BASE_TAG}" FDO_DISTRIBUTION_EXEC: >- - bash ci/install-rust.sh ${RUST_STABLE} aarch64-unknown-linux-gnu && - pip3 install gi-docgen + bash ci/install-rust.sh ${RUST_STABLE} aarch64-unknown-linux-gnu tags: - aarch64 -- cgit v1.2.1