Merge branch 'fam-ci' into 'master'

Fam ci

See merge request GNOME/glib!78

.gitlab-ci.yml

@@ -19,7 +19,7 @@ fedora-meson-x86_64:
   variables:
     CFLAGS: "-coverage -ftest-coverage -fprofile-arcs"
   script:
-    - meson --buildtype debug --werror -Dsystemtap=true -Ddtrace=true _build .
+    - meson --buildtype debug --werror -Dsystemtap=true -Ddtrace=true -Dfam=true _build .
     - ninja -C _build
     - meson test -C _build --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER}
     - mkdir -p _coverage

.gitlab-ci/Dockerfile

@@ -4,6 +4,7 @@ RUN dnf -y install \
     desktop-file-utils \
     elfutils-libelf-devel \
     findutils \
+    gamin-devel \
     gcc \
     gcc-c++ \
     gettext \
@@ -18,21 +19,21 @@ RUN dnf -y install \
     libmount-devel \
     libselinux-devel \
     libxslt \
+    make \
+    mingw64-gcc \
+    mingw64-gcc-c++ \
+    mingw64-gettext \
+    mingw64-libffi \
+    mingw64-zlib \
     ninja-build \
     pcre-devel \
     python3 \
     python3-pip \
     python3-wheel \
     systemtap-sdt-devel \
-    zlib-devel \
-    wget \
     unzip \
-    make \
+    wget \
-    mingw64-gcc \
+    zlib-devel \
-    mingw64-gcc-c++ \
-    mingw64-gettext \
-    mingw64-zlib \
-    mingw64-libffi \
  && dnf clean all
 
 RUN pip3 install meson