Merge branch 'update-ci' into 'main'

ci: Update the Fedora image

See merge request GNOME/pango!618

4 files changed, 10 insertions, 10 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e93f7dea..0b8d413c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ stages:
 variables:
   COMMON_MESON_FLAGS: "--fatal-meson-warnings --werror"
   MESON_TEST_TIMEOUT_MULTIPLIER: 2
-  FEDORA_IMAGE: registry.gitlab.gnome.org/gnome/pango/fedora:v8
+  FEDORA_IMAGE: registry.gitlab.gnome.org/gnome/pango/fedora:v9
 
 .only-default:
   only:
@@ -95,7 +95,7 @@ macos:
     - macos
   needs: []
   before_script:
-    - pip3 install --user meson==0.56
+    - pip3 install --user meson==0.60.3
     - pip3 install --user ninja
   script:
     - meson -Dintrospection=disabled
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index a7600b46..73ade0c4 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:34
+FROM fedora:36
 
 RUN dnf -y install \
     abattis-cantarell-fonts \
diff --git a/tests/layouts/valid-14.layout b/tests/layouts/valid-14.layout
index 427cb5ee..13e16683 100644
--- a/tests/layouts/valid-14.layout
+++ b/tests/layouts/valid-14.layout
@@ -25,7 +25,7 @@
     "is-ellipsized" : true,
     "unknown-glyphs" : 1,
     "width" : 161792,
-    "height" : 20480,
+    "height" : 21047,
     "log-attrs" : [
       {
         "char-break" : true,
@@ -261,7 +261,7 @@
               ]
             },
             "flags" : 0,
-            "y-offset" : 0,
+            "y-offset" : 567,
             "start-x-offset" : 0,
             "end-x-offset" : 0,
             "glyphs" : [
@@ -360,7 +360,7 @@
               ]
             },
             "flags" : 0,
-            "y-offset" : 0,
+            "y-offset" : 337,
             "start-x-offset" : 0,
             "end-x-offset" : 0,
             "glyphs" : [
diff --git a/tests/layouts/valid-20.layout b/tests/layouts/valid-20.layout
index db692b73..5b2bcf15 100644
--- a/tests/layouts/valid-20.layout
+++ b/tests/layouts/valid-20.layout
@@ -40,7 +40,7 @@
     "is-wrapped" : false,
     "is-ellipsized" : false,
     "unknown-glyphs" : 0,
-    "width" : 67584,
+    "width" : 76800,
     "height" : 25600,
     "log-attrs" : [
       {
@@ -138,7 +138,7 @@
             "glyphs" : [
               {
                 "glyph" : 244,
-                "width" : 15360,
+                "width" : 18432,
                 "x-offset" : 14764,
                 "y-offset" : 3845,
                 "is-cluster-start" : true,
@@ -146,7 +146,7 @@
               },
               {
                 "glyph" : 272,
-                "width" : 15360,
+                "width" : 18432,
                 "x-offset" : 14764,
                 "y-offset" : 4280,
                 "is-cluster-start" : true,
@@ -154,7 +154,7 @@
               },
               {
                 "glyph" : 273,
-                "width" : 15360,
+                "width" : 18432,
                 "x-offset" : 14764,
                 "y-offset" : 3507,
                 "is-cluster-start" : true,