gitlab-ci: hopefully fix the CI failures after base image bumps
The Ubuntu image needs a rebuild, because there's already an image with that same version which lacks meson. And likewise Fedora needs a rebuild, because we still need python3-pip for two sub-images and this is (probably) the least bad way to deal with that. Signed-off-by: Niklāvs Koļesņikovs <89q1r14hd@relay.firefox.com>
This commit is contained in:
parent
12f415381a
commit
5c72539e2e
|
@ -25,7 +25,7 @@ include:
|
||||||
.fedora:
|
.fedora:
|
||||||
variables:
|
variables:
|
||||||
# Update this tag when you want to trigger a rebuild
|
# Update this tag when you want to trigger a rebuild
|
||||||
FDO_DISTRIBUTION_TAG: '2023-04-17.0'
|
FDO_DISTRIBUTION_TAG: '2023-04-18.0'
|
||||||
FDO_DISTRIBUTION_VERSION: '37'
|
FDO_DISTRIBUTION_VERSION: '37'
|
||||||
FDO_DISTRIBUTION_PACKAGES: >-
|
FDO_DISTRIBUTION_PACKAGES: >-
|
||||||
alsa-lib-devel
|
alsa-lib-devel
|
||||||
|
@ -60,6 +60,7 @@ include:
|
||||||
openssl-devel
|
openssl-devel
|
||||||
pulseaudio-libs-devel
|
pulseaudio-libs-devel
|
||||||
python3-docutils
|
python3-docutils
|
||||||
|
python3-pip
|
||||||
sbc-devel
|
sbc-devel
|
||||||
ShellCheck
|
ShellCheck
|
||||||
SDL2-devel
|
SDL2-devel
|
||||||
|
@ -73,19 +74,21 @@ include:
|
||||||
pulseaudio-utils
|
pulseaudio-utils
|
||||||
openal-soft
|
openal-soft
|
||||||
readline-devel
|
readline-devel
|
||||||
# Uncommenting the following three lines and disabling the meson entry above
|
# Uncommenting the following two lines and disabling the meson entry above
|
||||||
# will re-enable use of Meson via pip but please consider using a newer distro
|
# 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
|
# 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
|
# using pip or another 3rd party repo defeats the point testing the particular
|
||||||
# distro for regressions.
|
# distro for regressions.
|
||||||
# python3-pip
|
# NOTE: If you do end up using pip3 for meson, be sure to also update the
|
||||||
|
# build_meson_prerelease and build_meson_exact_release build instructions
|
||||||
|
# to uninstall the pip3 version again and probably to not call dnf remove
|
||||||
# FDO_DISTRIBUTION_EXEC: >-
|
# FDO_DISTRIBUTION_EXEC: >-
|
||||||
# pip3 install meson
|
# pip3 install meson
|
||||||
|
|
||||||
.ubuntu:
|
.ubuntu:
|
||||||
variables:
|
variables:
|
||||||
# Update this tag when you want to trigger a rebuild
|
# Update this tag when you want to trigger a rebuild
|
||||||
FDO_DISTRIBUTION_TAG: '2023-04-17.0'
|
FDO_DISTRIBUTION_TAG: '2023-04-18.0'
|
||||||
FDO_DISTRIBUTION_VERSION: '22.04'
|
FDO_DISTRIBUTION_VERSION: '22.04'
|
||||||
FDO_DISTRIBUTION_PACKAGES: >-
|
FDO_DISTRIBUTION_PACKAGES: >-
|
||||||
debhelper-compat
|
debhelper-compat
|
||||||
|
@ -370,6 +373,7 @@ build_meson_prerelease:
|
||||||
extends:
|
extends:
|
||||||
- .build_on_fedora
|
- .build_on_fedora
|
||||||
script:
|
script:
|
||||||
|
- dnf remove --assumeyes meson
|
||||||
- pip3 install --upgrade --pre meson
|
- pip3 install --upgrade --pre meson
|
||||||
- echo "Building with meson options $MESON_OPTIONS"
|
- echo "Building with meson options $MESON_OPTIONS"
|
||||||
- meson setup "$BUILD_DIR" --prefix="$PREFIX" $MESON_OPTIONS
|
- meson setup "$BUILD_DIR" --prefix="$PREFIX" $MESON_OPTIONS
|
||||||
|
@ -386,7 +390,8 @@ build_meson_exact_release:
|
||||||
- meson_version=$(head -n 5 meson.build | grep 'meson_version' | sed -e 's/.*\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/')
|
- meson_version=$(head -n 5 meson.build | grep 'meson_version' | sed -e 's/.*\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/')
|
||||||
- echo "Requiring meson version $meson_version"
|
- echo "Requiring meson version $meson_version"
|
||||||
- test -n "$meson_version" || (echo "Meson version parser failed" && exit 1)
|
- test -n "$meson_version" || (echo "Meson version parser failed" && exit 1)
|
||||||
- pip3 uninstall --yes meson
|
- dnf remove --assumeyes meson
|
||||||
|
# - pip3 uninstall --yes meson
|
||||||
- pip3 install "meson==$meson_version"
|
- pip3 install "meson==$meson_version"
|
||||||
- echo "Building with meson options $MESON_OPTIONS"
|
- echo "Building with meson options $MESON_OPTIONS"
|
||||||
- meson setup "$BUILD_DIR" --prefix="$PREFIX" $MESON_OPTIONS
|
- meson setup "$BUILD_DIR" --prefix="$PREFIX" $MESON_OPTIONS
|
||||||
|
|
Loading…
Reference in New Issue