summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-01-29 12:49:20 -0500
committerMatthias Clasen <mclasen@redhat.com>2021-01-29 12:55:46 -0500
commitb37a69d76c59a466f35a6ee28d60fa2d444b5d87 (patch)
treeffbe70da6968dd13c7881bce0bccd21174cc4da2
parent454caa3eecddf7a6f1030bfb2ca82d5e97ebc74b (diff)
downloadgtk+-b37a69d76c59a466f35a6ee28d60fa2d444b5d87.tar.gz
ci: Add mesa-libGLES-devel
Try again, since libglvnd-devel is not the right choice.
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--.gitlab-ci/fedora-base.Dockerfile2
-rw-r--r--.gitlab-ci/fedora.Dockerfile2
3 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7514359ed3..00624776e5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,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:v26"
+ FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v27"
FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v25"
diff --git a/.gitlab-ci/fedora-base.Dockerfile b/.gitlab-ci/fedora-base.Dockerfile
index f61a8fc3cf..613d492d34 100644
--- a/.gitlab-ci/fedora-base.Dockerfile
+++ b/.gitlab-ci/fedora-base.Dockerfile
@@ -47,7 +47,6 @@ RUN dnf -y install \
libcloudproviders-devel \
libepoxy-devel \
libffi-devel \
- libglvnd-devel \
libmount-devel \
librsvg2 \
libselinux-devel \
@@ -66,6 +65,7 @@ RUN dnf -y install \
libxslt \
mesa-dri-drivers \
mesa-libEGL-devel \
+ mesa-libGLES-devel \
mesa-libwayland-egl-devel \
ninja-build \
pango-devel \
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index e380ef78d7..ddcc18f287 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v26
+FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v27
# Enable sudo for wheel users
RUN sed -i -e 's/# %wheel/%wheel/' -e '0,/%wheel/{s/%wheel/# %wheel/}' /etc/sudoers