[network-manager-sstp/gtk4-work: 2/2] Updating the CI/CD script

[Eivind Næss <eivnaes src gnome org>]

commit 2f5f5d30f6c4c24a01ef2fc4b85a920edea6d9c4
Author: Eivind Næss <eivnaes yahoo com>
Date:   Sat Apr 2 13:45:23 2022 -0700

    Updating the CI/CD script
    
    Signed-off-by: Eivind Næss <eivnaes yahoo com>

 .gitlab-ci.yml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cf16e5b..82f1f1f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,11 +8,13 @@
   before_script:
     - dnf -y install
       file
+      bzip2
       findutils
       gcc
       gettext-devel
       glib2-devel
       gtk3-devel
+      gtk4-devel
       gnutls-devel
       sstp-client-devel
       intltool
@@ -27,7 +29,7 @@
 .dist: &dist
   stage: test
   dependencies:
-    - fedora28_dist
+    - fedora35_dist
   variables:
     GIT_STRATEGY: none
 
@@ -36,7 +38,7 @@
   <<: *dist
   script:
     - dnf -y install make
-    - tar xJf NetworkManager-sstp-*.tar.xz
+    - tar jxf NetworkManager-sstp-*.tar.bz2
     - cd NetworkManager-sstp-*/
     - ./configure
       --disable-silent-rules
@@ -47,22 +49,25 @@
     - make -j uninstall
 
 # Roll the distribution tarball
-fedora28_dist:
+fedora35_dist:
   <<: *fedora_deps
-  image: fedora:28
+  image: fedora:35
   stage: build
   script:
     - dnf -y install
       /usr/bin/autopoint
       autoconf automake make
+      xorg-x11-server-Xvfb xorg-x11-xinit
       NetworkManager-devel
       NetworkManager-glib-devel
       libnm-gtk-devel
     - sh autogen.sh
-    - make -j distcheck
+    # The Xvfb dance below is because gtk4-builder-tool require a display
+    - xinit /bin/sh -c 'make -j distcheck && touch .success' -- /usr/bin/Xvfb :5
+    - test -e .success
   artifacts:
     paths:
-      - "*.xz"
+      - "*.tar.bz2"
 
 fedora_from_dist:
   <<: *fedora_from_dist