Merge branch 'ci-update' into 'master'

ci: Install Monospace fonts

See merge request GNOME/gtk!742

.gitlab-ci.yml

@@ -13,7 +13,7 @@ stages:
     - subprojects/pango/
 
 fedora-x86_64:
-  image: registry.gitlab.gnome.org/gnome/gtk/master:v3
+  image: registry.gitlab.gnome.org/gnome/gtk/master:v4
   stage: build
   script:
     - bash -x ./.gitlab-ci/test-docker.sh
@@ -99,7 +99,7 @@ flatpak-master:icon-browser:
   <<: *flatpak-master
 
 pages:
-  image: registry.gitlab.gnome.org/gnome/gtk/master:v3
+  image: registry.gitlab.gnome.org/gnome/gtk/master:v4
   stage: deploy 
   script:
     - meson -Ddocumentation=true _build .

.gitlab-ci/Dockerfile

@@ -11,6 +11,7 @@ RUN dnf -y install \
     ccache \
     colord-devel \
     cups-devel \
+    dejavu-sans-mono-fonts \
     desktop-file-utils \
     elfutils-libelf-devel \
     fribidi-devel \

.gitlab-ci/run-docker.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-TAG="registry.gitlab.gnome.org/gnome/gtk/master:v3"
+TAG="registry.gitlab.gnome.org/gnome/gtk/master:v4"
 
 sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
     --file "Dockerfile" .

testsuite/reftests/meson.build

@@ -418,10 +418,9 @@ xfails = [
   'border-half-pixel.ui',
   'border-image-url.ui',
   'label-shadows.ui',
-  'label-sizing.ui',
-  'label-wrap-justify.ui',
   'sizegroups-evolution-identity-page.ui',
   'textview-border-windows.ui',
+  'textview-margins.ui',
   'window-show-contents-on-map.ui',
 ]