ci: Bump base image to F37

And clean up custom installs.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2769>
This commit is contained in:
Robert Mader 2022-12-17 18:12:43 +01:00
parent 6adc2e4b59
commit 02d35309e6

View File

@ -17,15 +17,14 @@ variables:
.mutter.fedora@common: .mutter.fedora@common:
variables: variables:
FDO_DISTRIBUTION_VERSION: 36 FDO_DISTRIBUTION_VERSION: 37
BASE_TAG: '2022-11-25.0' BASE_TAG: '2022-12-17.0'
FDO_DISTRIBUTION_PACKAGES: FDO_DISTRIBUTION_PACKAGES:
asciidoc asciidoc
clang clang
gcovr gcovr
gdm gdm
gnome-shell gnome-shell
mozjs91-devel
sassc sassc
uncrustify uncrustify
xorg-x11-server-Xvfb xorg-x11-server-Xvfb
@ -48,28 +47,6 @@ variables:
dnf builddep -y wayland-protocols --setopt=install_weak_deps=False && dnf builddep -y wayland-protocols --setopt=install_weak_deps=False &&
dnf builddep -y kernel --setopt=install_weak_deps=False && dnf builddep -y kernel --setopt=install_weak_deps=False &&
./.gitlab-ci/install-meson-project.sh \
https://gitlab.gnome.org/GNOME/gjs.git \
1.73.1 . &&
./.gitlab-ci/install-meson-project.sh \
-Dvapi=false \
-Dgtk3=false \
-Dgtk4=false \
-Dgtk_doc=false \
-Dssh_agent=false \
-Dsystemd=disabled \
https://gitlab.gnome.org/GNOME/gcr.git \
3.90.0 . &&
./.gitlab-ci/install-meson-project.sh \
https://gitlab.freedesktop.org/wayland/wayland.git \
1.21.0 . &&
./.gitlab-ci/install-meson-project.sh \
https://gitlab.freedesktop.org/wayland/wayland-protocols.git \
1.26 . &&
./.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 . 29ad36e2b1d28ac9d8b2bc44af46296cb1db5d66 && main . 29ad36e2b1d28ac9d8b2bc44af46296cb1db5d66 &&