diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2023-05-03 20:18:24 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2023-05-03 20:18:58 -0400 |
| commit | bfea39ab2f1e9c1924828e95f464aa8252e2b123 (patch) | |
| tree | 3f6a2d6a6bd9fb482387a6b8b8ebde87776e2580 | |
| parent | 84d6f023b52c31ff7c47da6bf99f524b87b67b18 (diff) | |
| download | gtk+-bfea39ab2f1e9c1924828e95f464aa8252e2b123.tar.gz | |
ci: Add meson back to the fedora image
| -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 f99dd5ccae..65686b7d64 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ variables: BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true" FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled -Ddemos=false -Dbuild-examples=false -Dbuild-tests=false -Dbuild-testsuite=true" MESON_TEST_TIMEOUT_MULTIPLIER: 3 - FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v45" + FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v46" workflow: rules: diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index 423a076854..39c606e856 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -72,6 +72,7 @@ RUN dnf -y install \ mesa-dri-drivers \ mesa-libEGL-devel \ mesa-libGLES-devel \ + meson \ mutter \ ninja-build \ pango-devel \ |