Merge branch 'fix-fedora-ci-build' into 'master'

Rebuild Fedora CI image

See merge request GNOME/glib!1488

.gitlab-ci.yml

@@ -10,7 +10,7 @@ cache:
     - _ccache/
 
 variables:
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v8"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v9"
   DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v6"
   ANDROID_IMAGE: "registry.gitlab.gnome.org/gnome/glib/android-ndk:v3"
   MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v2"

.gitlab-ci/README.md

@@ -15,7 +15,8 @@ GitLab CI jobs run in a Docker image, defined here. To update that image
       registry
     * If you use 2-factor authentication on your GNOME GitLab account, you'll
       need to [create a personal access token][pat] and use that rather than
-      your normal password
+      your normal password — the token should have `read_registry` and
+      `write_registry` permissions
 1. Edit `.gitlab-ci.yml` (in the root of this repository) to use your new
    image
 

.gitlab-ci/fedora.Dockerfile

@@ -45,6 +45,7 @@ RUN dnf -y update \
     ninja-build \
     pcre-devel \
     "python3-dbusmock >= 0.18.3-2" \
+    python3-pip \
     python3-pygments \
     python3-wheel \
     shared-mime-info \

.gitlab-ci/meson-junit-report.py

@@ -47,7 +47,11 @@ suites = {}
 for line in args.infile:
     data = json.loads(line)
     (full_suite, unit_name) = data['name'].split(' / ')
+    try:
         (project_name, suite_name) = full_suite.split(':')
+    except ValueError:
+        project_name = full_suite
+        suite_name = full_suite
 
     duration = data['duration']
     return_code = data['returncode']

docs/reference/meson.build

@@ -52,7 +52,7 @@ if get_option('gtk_doc')
   endif
   # Check we have the minimum gtk-doc version required. Older versions won't
   # generate correct documentation.
-  dependency('gtk-doc', version : '>=1.32',
+  dependency('gtk-doc', version : '>=1.32.1',
     fallback : ['gtk-doc', 'dummy_dep'],
     default_options : ['tests=false'])
 endif