From 8f53394fb529e47e152a8ade9daf85c8c7057e85 Mon Sep 17 00:00:00 2001 From: Dylan Van Assche Date: Tue, 21 Nov 2023 18:15:45 +0100 Subject: [PATCH] CI: more fixes Passed fine in MR, but not in master --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ae59cf5..9d0a090 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,9 +27,9 @@ build_stable: before_script: # Undo delangification present in the Fedora Docker images - rm -f /etc/rpm/macros.image-language-conf - - dnf update -y + - if [ -x /bin/dnf ]; then dnf update -y; else dnf5 update -y; fi - if [ -x /bin/dnf ]; then dnf install -y $DEPENDENCIES; else dnf5 install -y $DEPENDENCIES; fi - - dnf reinstall -y glib2 + - if [ -x /bin/dnf ]; then dnf reinstall -y glib2; else dnf5 reinstall -y glib2; fi script: - meson -Dtests=true -Dgtk_doc=true -Dgtk-tests=true _build - ninja -v -C _build