LADI
/
spa
1
Fork 0

gitlab-ci: update Fedora image from 35 to 37

According to gkiagia Fedora 37 is a better choice, because it's newer and its
compatibility with Coverity has been verified by WirePlumber's CI setup already.
Therefore upgrading the CI image to F37 should be safe.

Also fixed a typo in a previous commit's comment introduced by autocompletion.

Signed-off-by: Niklāvs Koļesņikovs <89q1r14hd@relay.firefox.com>
This commit is contained in:
Niklāvs Koļesņikovs 2023-04-17 21:19:09 +03:00 committed by Wim Taymans
parent 3e23a7028b
commit 12f415381a
1 changed files with 14 additions and 8 deletions

View File

@ -25,8 +25,8 @@ include:
.fedora:
variables:
# Update this tag when you want to trigger a rebuild
FDO_DISTRIBUTION_TAG: '2023-03-09.0'
FDO_DISTRIBUTION_VERSION: '35'
FDO_DISTRIBUTION_TAG: '2023-04-17.0'
FDO_DISTRIBUTION_VERSION: '37'
FDO_DISTRIBUTION_PACKAGES: >-
alsa-lib-devel
avahi-devel
@ -50,12 +50,13 @@ include:
libmysofa-devel
libsndfile-devel
libubsan
libusb-devel
libusb1-devel
lilv-devel
libv4l-devel
libva-devel
libX11-devel
ModemManager-devel
meson
openssl-devel
pulseaudio-libs-devel
python3-docutils
@ -69,12 +70,17 @@ include:
valgrind
ninja-build
pkgconf
python3-pip
pulseaudio-utils
openal-soft
readline-devel
FDO_DISTRIBUTION_EXEC: >-
pip3 install meson
# Uncommenting the following three lines and disabling the meson entry above
# will re-enable use of Meson via pip but please consider using a newer distro
# image first or making the build system compatible instead! This is because
# using pip or another 3rd party repo defeats the point testing the particular
# distro for regressions.
# python3-pip
# FDO_DISTRIBUTION_EXEC: >-
# pip3 install meson
.ubuntu:
variables:
@ -100,12 +106,12 @@ include:
libva-dev
libv4l-dev
libx11-dev
meson
ninja-build
pkg-config
python3-docutils
systemd
meson
# Uncommentating the following three lines and removing the meson entry above
# Uncommenting the following three lines and disabling the meson entry above
# will re-enable use of Meson via pip but please consider using a newer distro
# image first or making the build system compatible instead! This is because
# using pip or another 3rd party repo defeats the point testing the particular