[gtk/ci-install-build: 3/3] ci: Update the image
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/ci-install-build: 3/3] ci: Update the image
- Date: Wed, 9 Jun 2021 12:43:24 +0000 (UTC)
commit 193903ce4a2b222f167bfe99743fe2b9c822726e
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Jun 9 07:10:13 2021 -0400
ci: Update the image
v32 of the image includes wayland-protocols 1.21, and
other updates from Fedora 34.
While we are at it, drop gtk-doc from the image, and drop
the separate DOCS_IMAGE - no longer used.
.gitlab-ci.yml | 5 ++---
.gitlab-ci/fedora.Dockerfile | 1 -
2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c279497ecb..026e5fe95c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,9 +24,8 @@ 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:v31"
+ FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v32"
FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
- DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v31"
.only-default:
only:
@@ -308,7 +307,7 @@ asan-build:
allow_failure: true
reference:
- image: $DOCS_IMAGE
+ image: $FEDORA_IMAGE
stage: docs
needs: []
variables:
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 4f2aece467..40c9850f52 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -38,7 +38,6 @@ RUN dnf -y install \
gstreamer1-plugins-good \
gstreamer1-plugins-bad-free-devel \
gstreamer1-plugins-base-devel \
- gtk-doc \
hicolor-icon-theme \
iso-codes \
itstool \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]