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 <peter.hutterer@who-t.net>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f33c24887cbce99b1a6e042cf20c61c02d0b3f16..58faa7d505d8d34d62e6039af196746fd6909639 100644 (file)
--- 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 b5844afb175816c9c848d96f69618e551f87ce77..d5725b9c95019ec819e0414db1ba81fc44402fe2 100644 (file)
--- 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: