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 b2d911ffe5c576a11efe989cf4e08c4786fac9c0..c560ee6b76145fde63b4dec16c5e9679c5ea5e62 100644 (file)
--- 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 162a1a88df6d24821199e8da9efe000a0574fc1b..295ffa33d27e5d477e83b7a868e5d3798876661a 100644 (file)
--- 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 31bb1697f55a54c70c794760b3e38a7bb72436d2..6800059bf77bfcb6120134fa0cb9e027866d7dd3 100644 (file)
--- 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 \