From: Matthias Clasen Date: Sat, 14 May 2022 12:41:18 +0000 (-0400) Subject: ci: Update the Fedora image to Fedora 36 X-Git-Tag: archive/raspbian/4.8.3+ds-2+rpi1~3^2~20^2~4^2~192^2~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=aa9a8702e4c862a934d3095f8676dc34afe54da4;p=gtk4.git ci: Update the Fedora image to Fedora 36 Also remove systemtap from the image, since we don't need it. The v36 image is still used in gtk-4-6. --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b2d911ffe5..c560ee6b76 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:v36" + FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v38" FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master" .only-default: diff --git a/.gitlab-ci/README.md b/.gitlab-ci/README.md index 162a1a88df..295ffa33d2 100644 --- a/.gitlab-ci/README.md +++ b/.gitlab-ci/README.md @@ -14,6 +14,9 @@ Each Docker image has a tag composed of two parts: See the [container registry][registry] for the available images for each branch, as well as their available versions. +Note that using `latest` as version number will overwrite the most +recently uploaded image in the registry. + ### Checklist for Updating a CI image - [ ] Update the `${image}.Dockerfile` file with the dependencies diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index 31bb1697f5..6800059bf7 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:34 +FROM fedora:36 RUN dnf -y install \ adwaita-icon-theme \ @@ -87,7 +87,6 @@ RUN dnf -y install \ python3-wheel \ redhat-rpm-config \ sassc \ - systemtap-sdt-devel \ vulkan-devel \ wayland-devel \ wayland-protocols-devel \