From 855a9cfcadd6adae30a94331a02d3723ef9f1051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 23 Feb 2024 16:03:13 +0100 Subject: [PATCH] ci: Rebase image to F40 F39 has been branched, so we can use it as base of our CI image and reduce the number of custom built components. Part-of: --- .gitlab-ci.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd3b2d7e8..7aadfceb2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -84,8 +84,8 @@ variables: extends: - .skip-git-clone variables: - FDO_DISTRIBUTION_VERSION: 39 - BASE_TAG: '2024-02-14.0' + FDO_DISTRIBUTION_VERSION: 40 + BASE_TAG: '2024-02-23.0' MUTTER_USER: 'meta-user' FDO_DISTRIBUTION_PACKAGES: asciidoc @@ -119,21 +119,12 @@ variables: dnf builddep -y mutter --setopt=install_weak_deps=False dnf builddep -y gnome-shell --setopt=install_weak_deps=False dnf builddep -y kernel --setopt=install_weak_deps=False - dnf builddep -y libei --setopt=install_weak_deps=False dnf builddep -y gi-docgen --setopt=install_weak_deps=False ./.gitlab-ci/install-meson-project.sh \ https://gitlab.gnome.org/jadahl/catch.git \ main - ./.gitlab-ci/install-meson-project.sh \ - https://gitlab.freedesktop.org/libinput/libei.git \ - 1.0.901 - - ./.gitlab-ci/install-meson-project.sh \ - https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas.git \ - master - ./.gitlab-ci/install-meson-project.sh \ https://gitlab.gnome.org/GNOME/gi-docgen.git \ main