From 68f39925edbb97e78cd23b3d055f3e6dec9202d9 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 27 Jun 2022 10:00:55 +1000 Subject: [PATCH] gitlab CI: dnf remove gtk4-devel for the no-debug-gui deps job We've long preferred GTK4 and that's installed on our images, so let's make sure that gets removed together with GTK3 (which isn't actually installed anyway). Signed-off-by: Peter Hutterer --- .gitlab-ci.yml | 2 +- .gitlab-ci/ci.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f33c248..58faa7d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -777,7 +777,7 @@ build-no-debuggui-nodeps@fedora:36: variables: MESON_ARGS: "-Ddebug-gui=false" before_script: - - dnf remove -y gtk3-devel + - dnf remove -y gtk3-devel gtk4-devel build-no-tests@fedora:36: extends: diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index b5844af..d5725b9 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -487,7 +487,7 @@ build-no-debuggui-nodeps@{{distro.name}}:{{version}}: variables: MESON_ARGS: "-Ddebug-gui=false" before_script: - - dnf remove -y gtk3-devel + - dnf remove -y gtk3-devel gtk4-devel build-no-tests@{{distro.name}}:{{version}}: extends: -- 2.7.4