[NetworkManager-openvpn/lr/test: 8/8] gitlab: enable gtk4 testing

[Lubomir Rintel <lkundrak src gnome org>]

commit 538f92322b0a9d832df9462015b782fca9b644f5
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Tue Jun 28 10:51:45 2022 +0200

    gitlab: enable gtk4 testing

 .gitlab-ci.yml | 70 +++++++++++++++++++++++-----------------------------------
 1 file changed, 28 insertions(+), 42 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 319aff3..5cb7a97 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,11 +6,10 @@
 
 .fedora_deps: &fedora_deps
   before_script:
-    - dnf -y install
+    - dnf -y install $EXTRA_PACKAGES
       file
       findutils
       gcc
-      make
       gettext-devel
       glib2-devel
       gtk3-devel
@@ -19,17 +18,33 @@
       libnma-devel
       NetworkManager-libnm-devel
       pkgconfig
+      ppp-devel
+      appstream
 
 # Disable fetching Git, run after the tarball is rolled
 .dist: &dist
   stage: test
   dependencies:
-    - fedora_dist
+    - fedora36_dist
   variables:
     GIT_STRATEGY: none
 
+.fedora_from_dist: &fedora_from_dist
+  <<: *fedora_deps
+  <<: *dist
+  script:
+    - dnf -y install make
+    - tar xJf NetworkManager-openvpn-*.tar.xz
+    - cd NetworkManager-openvpn-*/
+    - ./configure $EXTRA_CONFIGURE_FLAGS
+      --disable-silent-rules
+    - make -j
+    - make -j check
+    - make -j install
+    - make -j uninstall
+
 # Roll the distribution tarball
-fedora_dist:
+fedora36_dist:
   <<: *fedora_deps
   image: fedora:36
   stage: build
@@ -37,49 +52,20 @@ fedora_dist:
     - dnf -y install
       /usr/bin/autopoint
       autoconf automake make
-      NetworkManager-libnm-devel
-      libnma-gtk4-devel
-      xorg-x11-server-Xvfb xorg-x11-xinit
+      gtk4-devel
     - sh autogen.sh
-    # The Xvfb dance below is because of
-    # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4415
-    - xinit /bin/sh -c 'make -j distcheck && touch .success' -- /usr/bin/Xvfb :5
-    - test -e .success
+    - make -j dist
   artifacts:
     paths:
       - "*.xz"
 
-fedora28_from_dist:
-  <<: *dist
-  <<: *fedora_deps
-  script:
-    - tar xJf NetworkManager-openvpn-*.tar.xz
-    - cd NetworkManager-openvpn-*/
-    # Sometimes the CI builder clocks are skewed.
-    # Make sure the dst files are not from future.
-    - find |xargs touch
-    - ./configure
-      --disable-silent-rules
-    - make -j
-    - make -j check
-    - make -j install
-    - make -j uninstall
+fedora_28_from_dist:
+  <<: *fedora_from_dist
   image: fedora:28
 
-# A regular build on recent Fedora
-fedora_from_dist:
-  <<: *dist
-  <<: *fedora_deps
-  script:
-    - tar xJf NetworkManager-openvpn-*.tar.xz
-    - cd NetworkManager-openvpn-*/
-    # Sometimes the CI builder clocks are skewed.
-    # Make sure the dst files are not from future.
-    - find |xargs touch
-    - ./configure
-      --disable-silent-rules
-    - make -j
-    - make -j check
-    - make -j install
-    - make -j uninstall
+fedora_latest_from_dist:
+  <<: *fedora_from_dist
+  variables:
+    EXTRA_PACKAGES: libnma-gtk4-devel
+    EXTRA_CONFIGURE_FLAGS: --with-gtk4
   image: fedora:latest