From b38c8da2040939e319e8590e5f672ef52a068049 Mon Sep 17 00:00:00 2001 From: Dylan Van Assche Date: Tue, 21 Nov 2023 18:05:02 +0100 Subject: [PATCH] CI: fix dnf Fedora is switching from dnf to dnf5, handle both in CI. --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6330a0a..ae59cf5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,8 @@ build_stable: before_script: # Undo delangification present in the Fedora Docker images - rm -f /etc/rpm/macros.image-language-conf - - dnf update -y && dnf install -y $DEPENDENCIES + - dnf update -y + - if [ -x /bin/dnf ]; then dnf install -y $DEPENDENCIES; else dnf5 install -y $DEPENDENCIES; fi - dnf reinstall -y glib2 script: - meson -Dtests=true -Dgtk_doc=true -Dgtk-tests=true _build