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

[Lubomir Rintel <lkundrak src gnome org>]

commit e6ec3a5e431e8966d87f1160f081ca510fdcba48
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Tue Jan 25 16:10:56 2022 +0100

    perhapsthisisbetter

 .gitlab-ci.yml | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ac5948a..09fe891 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,18 +26,6 @@ stages:
       NetworkManager-libnm-devel
       pkgconfig
 
-.unpack: &unpack
-  script:
-    - tar xJf NetworkManager-openvpn-*.tar.xz
-    - cd NetworkManager-openvpn-*/
-
-.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
@@ -56,7 +44,7 @@ fedora_dist:
       /usr/bin/autopoint
       autoconf automake make
       NetworkManager-libnm-devel
-      libnma-gtk4
+      libnma-gtk4-devel
     - sh autogen.sh
     - make -j distcheck
   artifacts:
@@ -67,8 +55,9 @@ fedora_dist:
 fedora28_from_dist:
   <<: *dist
   <<: *fedora_deps
-  <<: *unpack
   script:
+    - tar xJf NetworkManager-openvpn-*.tar.xz
+    - cd NetworkManager-openvpn-*/
     - dnf -y install
       NetworkManager-devel
       NetworkManager-glib-devel
@@ -76,18 +65,25 @@ fedora28_from_dist:
     - ./configure
       --disable-silent-rules
       --with-libnm-glib
-  <<: *check
+    - make -j
+    - make -j check
+    - make -j install
+    - make -j uninstall
   image: fedora:latest
 
 # A regular build on recent Fedora
 fedora_from_dist:
   <<: *dist
   <<: *fedora_deps
-  <<: *unpack
   script:
+    - tar xJf NetworkManager-openvpn-*.tar.xz
+    - cd NetworkManager-openvpn-*/
     - ./configure
       --disable-silent-rules
-  <<: *check
+    - make -j
+    - make -j check
+    - make -j install
+    - make -j uninstall
   image: fedora:latest
 
 triage:issues: