[NetworkManager-openvpn/lr/gtk-4.0: 8/19] gitlab-ci: move make dist to Rawhide

[Lubomir Rintel <lkundrak src gnome org>]

commit c9de8569263a773e80c837d176452fbb3e8b5145
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Tue Jan 25 16:00:00 2022 +0100

    gitlab-ci: move make dist to Rawhide
    
    This is going to be useful with Gtk4 code merged, because Rawhide is the
    only distribution that currently includes libnma-gtk4.

 .gitlab-ci.yml | 59 ++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 37 insertions(+), 22 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9cd4b4e..0449d87 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,6 +15,7 @@ stages:
       file
       findutils
       gcc
+      make
       gettext-devel
       glib2-devel
       gtk3-devel
@@ -29,45 +30,59 @@ stages:
 .dist: &dist
   stage: test
   dependencies:
-    - fedora28_dist
+    - fedora_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
-      --disable-silent-rules
-      --without-libnm-glib
-    - make -j
-    - make -j check
-    - make -j install
-    - make -j uninstall
-
 # Roll the distribution tarball
-fedora28_dist:
+fedora_dist:
   <<: *fedora_deps
-  image: fedora:28
+  image: fedora:36
   stage: build
   script:
     - dnf -y install
       /usr/bin/autopoint
       autoconf automake make
-      NetworkManager-devel
-      NetworkManager-glib-devel
-      libnm-gtk-devel
+      NetworkManager-libnm-devel
     - sh autogen.sh
     - make -j distcheck
   artifacts:
     paths:
       - "*.xz"
 
+# This one has libnm-glib
+fedora28_from_dist:
+  <<: *dist
+  <<: *fedora_deps
+  script:
+    - tar xJf NetworkManager-openvpn-*.tar.xz
+    - cd NetworkManager-openvpn-*/
+    - dnf -y install
+      NetworkManager-devel
+      NetworkManager-glib-devel
+      libnm-gtk-devel
+    - ./configure
+      --disable-silent-rules
+      --with-libnm-glib
+    - make -j
+    - make -j check
+    - make -j install
+    - make -j uninstall
+  image: fedora:28
+
+# A regular build on recent Fedora
 fedora_from_dist:
-  <<: *fedora_from_dist
+  <<: *dist
+  <<: *fedora_deps
+  script:
+    - tar xJf NetworkManager-openvpn-*.tar.xz
+    - cd NetworkManager-openvpn-*/
+    - ./configure
+      --disable-silent-rules
+    - make -j
+    - make -j check
+    - make -j install
+    - make -j uninstall
   image: fedora:latest
 
 triage:issues: