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: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3613>
This commit is contained in:
Florian Müllner 2024-02-23 16:03:13 +01:00 committed by Marge Bot
parent 5bd820d746
commit 855a9cfcad

View File

@ -84,8 +84,8 @@ variables:
extends: extends:
- .skip-git-clone - .skip-git-clone
variables: variables:
FDO_DISTRIBUTION_VERSION: 39 FDO_DISTRIBUTION_VERSION: 40
BASE_TAG: '2024-02-14.0' BASE_TAG: '2024-02-23.0'
MUTTER_USER: 'meta-user' MUTTER_USER: 'meta-user'
FDO_DISTRIBUTION_PACKAGES: FDO_DISTRIBUTION_PACKAGES:
asciidoc asciidoc
@ -119,21 +119,12 @@ variables:
dnf builddep -y mutter --setopt=install_weak_deps=False dnf builddep -y mutter --setopt=install_weak_deps=False
dnf builddep -y gnome-shell --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 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 dnf builddep -y gi-docgen --setopt=install_weak_deps=False
./.gitlab-ci/install-meson-project.sh \ ./.gitlab-ci/install-meson-project.sh \
https://gitlab.gnome.org/jadahl/catch.git \ https://gitlab.gnome.org/jadahl/catch.git \
main 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 \ ./.gitlab-ci/install-meson-project.sh \
https://gitlab.gnome.org/GNOME/gi-docgen.git \ https://gitlab.gnome.org/GNOME/gi-docgen.git \
main main