From 2d4a64ce2308d3f020c6e65ce48db2ba2f6c1ee8 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 30 Aug 2021 11:37:08 +0200 Subject: [PATCH] contrib: remove "vala-tools" from "contrib/fedora/REQUIRED_PACKAGES" Since Fedora 25, vala-tools was merged with "vala" package. And on rawhide (f36) it's gone completely and leads to a failure of the script. Drop it. (cherry picked from commit 53562b19150c411d882b8e33e870dff67c4307e0) --- .gitlab-ci.yml | 4 ++-- contrib/fedora/REQUIRED_PACKAGES | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 65b4d1e909..e40d643dc8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,10 +47,10 @@ variables: # # This is done by running `ci-fairy generate-template` and possibly bump # ".default_tag". - FEDORA_TAG: '2021-07-12.0-475202004c1a' + FEDORA_TAG: '2021-07-12.0-6e150e4c2732' UBUNTU_TAG: '2021-07-12.0-b77047ed62be' DEBIAN_TAG: '2021-07-12.0-b77047ed62be' - CENTOS_TAG: '2021-07-12.0-475202004c1a' + CENTOS_TAG: '2021-07-12.0-6e150e4c2732' ALPINE_TAG: '2021-07-12.0-d7a8aea74089' FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh' diff --git a/contrib/fedora/REQUIRED_PACKAGES b/contrib/fedora/REQUIRED_PACKAGES index ee2622de8d..5305f43b15 100755 --- a/contrib/fedora/REQUIRED_PACKAGES +++ b/contrib/fedora/REQUIRED_PACKAGES @@ -82,7 +82,6 @@ install \ teamd-devel \ util-linux \ vala-devel \ - vala-tools \ valgrind \ which \ "${EXTRA_PACKAGES[@]}"