[gtk/ci-update] ci: Update the Fedora image to Fedora 36
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/ci-update] ci: Update the Fedora image to Fedora 36
- Date: Sat, 14 May 2022 12:49:29 +0000 (UTC)
commit 778ff232bbdf1feb213ebd79cc8163835686e0d1
Author: Matthias Clasen <mclasen redhat com>
Date: Sat May 14 08:41:18 2022 -0400
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.
.gitlab-ci.yml | 2 +-
.gitlab-ci/README.md | 3 +++
.gitlab-ci/fedora.Dockerfile | 3 +--
3 files changed, 5 insertions(+), 3 deletions(-)
---
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 \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]