diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-01-29 19:05:47 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-01-29 19:05:47 +0000 |
| commit | cbf2feb63326a31cda60c3bcd7bf347a0d4fd30c (patch) | |
| tree | 7989caf65cbb4572fa565f0b3b3d4309ef91f045 | |
| parent | afe8ee501c070e24440049bd75f2b3943c0a733b (diff) | |
| parent | b37a69d76c59a466f35a6ee28d60fa2d444b5d87 (diff) | |
| download | gtk+-cbf2feb63326a31cda60c3bcd7bf347a0d4fd30c.tar.gz | |
Merge branch 'ci-gstreamer-deps' into 'master'
Ci gstreamer deps
See merge request GNOME/gtk!3133
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/fedora-base.Dockerfile | 1 | ||||
| -rw-r--r-- | .gitlab-ci/fedora.Dockerfile | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1f662c3a7f..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:v25" + 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 7719fe5e56..613d492d34 100644 --- a/.gitlab-ci/fedora-base.Dockerfile +++ b/.gitlab-ci/fedora-base.Dockerfile @@ -65,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 a7a35b4299..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:v25 +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 |