diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-09-14 12:27:39 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-09-14 12:27:39 +0000 |
| commit | cda5d2daddefc563f5b52af6daa56903b0b07214 (patch) | |
| tree | 04e2990c1050f299e3ae026a25d02bac196d1251 | |
| parent | b1a5c3ff554422b81f112991f6408bb8e05ee803 (diff) | |
| parent | c70fdd63312593d0f2d801169370f7f895ec5d4e (diff) | |
| download | gtk+-cda5d2daddefc563f5b52af6daa56903b0b07214.tar.gz | |
Merge branch 'tiff-ci' into 'master'
ci: Add libtiff-devel to the image
See merge request GNOME/gtk!3946
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/fedora.Dockerfile | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7bb81176b9..cc7402824c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,7 +25,7 @@ variables: BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true" FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled" MESON_TEST_TIMEOUT_MULTIPLIER: 3 - FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v33" + FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v34" FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master" .only-default: diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index ef0bb1aeb2..ef29a10a77 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -53,6 +53,7 @@ RUN dnf -y install \ libpng-devel \ librsvg2 \ libselinux-devel \ + libtiff-devel \ libubsan \ libXcomposite-devel \ libXcursor-devel \ |