diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2019-04-12 19:30:31 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2019-04-12 19:30:31 +0000 |
| commit | c5a4a26f069305e58b8a4773802e9a7328d415c2 (patch) | |
| tree | ffcb52b8dab72b0a9a50beb1542cf3134bb10741 | |
| parent | faff08193a6e4607e8eaecba3ffdf570c08c53c9 (diff) | |
| parent | 3046358d38ccd798146f22b96d3cb886bdfbbecf (diff) | |
| download | gtk+-c5a4a26f069305e58b8a4773802e9a7328d415c2.tar.gz | |
Merge branch 'ci-update' into 'master'
ci: Install Monospace fonts
See merge request GNOME/gtk!742
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile | 1 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker.sh | 2 | ||||
| -rw-r--r-- | testsuite/reftests/meson.build | 3 |
4 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f7b81247d8..c5c681fffd 100644 --- a/.gitlab-ci.yml +++ b/.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 . diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index a2866c5fac..8c32e8fa5b 100644 --- a/.gitlab-ci/Dockerfile +++ b/.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 \ diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh index 4b103b09a7..bcc8d7d076 100755 --- a/.gitlab-ci/run-docker.sh +++ b/.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" . diff --git a/testsuite/reftests/meson.build b/testsuite/reftests/meson.build index 37a38265ad..b91ec0927e 100644 --- a/testsuite/reftests/meson.build +++ b/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', ] |