diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2022-12-13 18:26:28 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2022-12-13 18:26:28 +0000 |
| commit | c5b5d53ae90e15c0ba74b75f08a39fa4098a03f7 (patch) | |
| tree | 22b2350a85a2d5fd1cbe7520af043791166c2a9d | |
| parent | 643bcacc14d27b2c200295d96224255f62fd13bb (diff) | |
| parent | 87b32d2ee37ae8b2768e0025aa6c85778489a145 (diff) | |
| download | pango-c5b5d53ae90e15c0ba74b75f08a39fa4098a03f7.tar.gz | |
Merge branch 'update-ci-image' into 'main'
ci: Update the Fedora image to F37
See merge request GNOME/pango!662
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/fedora.Dockerfile | 2 | ||||
| -rw-r--r-- | tests/layouts/valid-20.layout | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b8d413c..af18fc3a 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:v9 + FEDORA_IMAGE: registry.gitlab.gnome.org/gnome/pango/fedora:v10 .only-default: only: diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index 73ade0c4..dbf85908 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:36 +FROM fedora:37 RUN dnf -y install \ abattis-cantarell-fonts \ 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, |