[NetworkManager-openvpn/lr/gtk4-dist-check] doesthisevenwork

[Lubomir Rintel <lkundrak src gnome org>]

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

    doesthisevenwork

 .gitlab-ci.yml | 64 ++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 42 insertions(+), 22 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d56e38f..ac5948a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,6 +15,7 @@ stages:
       file
       findutils
       gcc
+      make
       gettext-devel
       glib2-devel
       gtk3-devel
@@ -25,49 +26,68 @@ stages:
       NetworkManager-libnm-devel
       pkgconfig
 
-# Disable fetching Git, run after the tarball is rolled
-.dist: &dist
-  stage: test
-  dependencies:
-    - fedora28_dist
-  variables:
-    GIT_STRATEGY: none
-
-.fedora_from_dist: &fedora_from_dist
-  <<: *fedora_deps
-  <<: *dist
+.unpack: &unpack
   script:
-    - dnf -y install make
     - tar xJf NetworkManager-openvpn-*.tar.xz
     - cd NetworkManager-openvpn-*/
-    - ./configure
-      --disable-silent-rules
-      --without-libnm-glib
+
+.check: &check
+  script:
     - make -j
     - make -j check
     - make -j install
     - make -j uninstall
 
+# Disable fetching Git, run after the tarball is rolled
+.dist: &dist
+  stage: test
+  dependencies:
+    - fedora_dist
+  variables:
+    GIT_STRATEGY: none
+
 # 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
+      libnma-gtk4
     - sh autogen.sh
-    - make -j dist
+    - make -j distcheck
   artifacts:
     paths:
       - "*.xz"
 
+# This one has libnm-glib
+fedora28_from_dist:
+  <<: *dist
+  <<: *fedora_deps
+  <<: *unpack
+  script:
+    - dnf -y install
+      NetworkManager-devel
+      NetworkManager-glib-devel
+      libnm-gtk-devel
+    - ./configure
+      --disable-silent-rules
+      --with-libnm-glib
+  <<: *check
+  image: fedora:latest
+
+# A regular build on recent Fedora
 fedora_from_dist:
-  <<: *fedora_from_dist
+  <<: *dist
+  <<: *fedora_deps
+  <<: *unpack
+  script:
+    - ./configure
+      --disable-silent-rules
+  <<: *check
   image: fedora:latest
 
 triage:issues: