[NetworkManager-fortisslvpn/lr/no-libnm-glib] gitlab: fix CI testing

[Lubomir Rintel <lkundrak src gnome org>]

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

    gitlab: fix CI testing
    
    We need to build the tarball on something that has Gtk4, and even
    without Gtk4 we need to test on f36 (because we depend on
    NMA_CERT_CHOOSER_FLAG_NO_PASSWORDS).

 .gitlab-ci.yml | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 38f81b6..dfe913b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,10 +6,11 @@
 
 .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,13 +20,12 @@
       NetworkManager-libnm-devel
       pkgconfig
       ppp-devel
-      appstream
 
 # Disable fetching Git, run after the tarball is rolled
 .dist: &dist
   stage: test
   dependencies:
-    - fedora28_dist
+    - fedora36_dist
   variables:
     GIT_STRATEGY: none
 
@@ -33,10 +33,9 @@
   <<: *fedora_deps
   <<: *dist
   script:
-    - dnf -y install make
     - tar xJf NetworkManager-fortisslvpn-*.tar.xz
     - cd NetworkManager-fortisslvpn-*/
-    - ./configure
+    - ./configure $EXTRA_CONFIGURE_FLAGS
       --disable-silent-rules
     - make -j
     - make -j check
@@ -44,20 +43,30 @@
     - make -j uninstall
 
 # Roll the distribution tarball
-fedora28_dist:
+fedora36_dist:
   <<: *fedora_deps
-  image: fedora:28
+  image: fedora:36
   stage: build
   script:
     - dnf -y install
       /usr/bin/autopoint
-      autoconf automake make
+      autoconf automake appstream
+      gtk4-devel
     - sh autogen.sh
     - make -j dist
   artifacts:
     paths:
       - "*.xz"
 
-fedora_from_dist:
+# Oldest we support, build without Gtk4
+fedora_36_from_dist:
+  <<: *fedora_from_dist
+  image: fedora:36
+
+# Test on a recent distro
+fedora_latest_from_dist:
   <<: *fedora_from_dist
+  variables:
+    EXTRA_PACKAGES: libnma-gtk4-devel
+    EXTRA_CONFIGURE_FLAGS: --with-gtk4
   image: fedora:latest