ci: Rebase image to F41
Fedora has branched, so we can use the newer F41 as base of our CI image to reduce the number of custom built components. Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4040>
This commit is contained in:
parent
313a438a7c
commit
625965d956
2 changed files with 13 additions and 47 deletions
|
@ -100,8 +100,8 @@ variables:
|
|||
extends:
|
||||
- .skip-git-clone
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: 40
|
||||
BASE_TAG: '2024-08-29.2'
|
||||
FDO_DISTRIBUTION_VERSION: 41
|
||||
BASE_TAG: '2024-09-20.2'
|
||||
MUTTER_USER: 'meta-user'
|
||||
FDO_DISTRIBUTION_PACKAGES:
|
||||
clang
|
||||
|
@ -142,10 +142,6 @@ variables:
|
|||
dnf builddep -y gi-docgen --setopt=install_weak_deps=False
|
||||
dnf builddep -y wayland --setopt=install_weak_deps=False
|
||||
|
||||
./.gitlab-ci/install-meson-project.sh \
|
||||
https://gitlab.gnome.org/GNOME/glib.git \
|
||||
2.81.1
|
||||
|
||||
./.gitlab-ci/install-meson-project.sh \
|
||||
https://gitlab.gnome.org/jadahl/catch.git \
|
||||
main
|
||||
|
@ -176,6 +172,9 @@ variables:
|
|||
git config --system --add safe.directory "$CI_PROJECT_DIR"
|
||||
|
||||
if [[ x"$(uname -m )" = "xx86_64" ]] ; then
|
||||
# deprecated header no longer included in openssl-devel
|
||||
dnf install -y openssl-devel-engine
|
||||
|
||||
if [ -n "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" ]; then
|
||||
git clone --depth $MUTTER_CLONE_DEPTH \
|
||||
$CI_MERGE_REQUEST_SOURCE_PROJECT_URL.git mutter-src \
|
||||
|
|
|
@ -56,44 +56,11 @@ done
|
|||
|
||||
SCRIPTS_DIR="$(dirname $0)"
|
||||
|
||||
if ! pkgconf --atleast-version 1.2.3 libpipewire-0.3
|
||||
then
|
||||
./$SCRIPTS_DIR/install-meson-project.sh \
|
||||
"${OPTIONS[@]}" \
|
||||
-Dalsa=disabled \
|
||||
-Dbluez5=disabled \
|
||||
-Dexamples=disabled \
|
||||
-Dgstreamer=disabled \
|
||||
-Djack=disabled \
|
||||
-Dman=disabled \
|
||||
-Dpipewire-alsa=disabled \
|
||||
-Dpipewire-jack=disabled \
|
||||
-Dsystemd=enabled \
|
||||
-Dtests=disabled \
|
||||
https://gitlab.freedesktop.org/pipewire/pipewire.git \
|
||||
1.2.3
|
||||
fi
|
||||
|
||||
if ! pkgconf --atleast-version 1.23.0 wayland-server
|
||||
then
|
||||
./$SCRIPTS_DIR/install-meson-project.sh \
|
||||
"${OPTIONS[@]}" \
|
||||
https://gitlab.freedesktop.org/wayland/wayland.git \
|
||||
1.23.0
|
||||
fi
|
||||
|
||||
if ! pkgconf --atleast-version 1.36 wayland-protocols
|
||||
then
|
||||
./$SCRIPTS_DIR/install-meson-project.sh \
|
||||
"${OPTIONS[@]}" \
|
||||
https://gitlab.freedesktop.org/wayland/wayland-protocols.git \
|
||||
1.36
|
||||
fi
|
||||
|
||||
if ! pkgconf --atleast-version 47.beta gsettings-desktop-schemas
|
||||
then
|
||||
./$SCRIPTS_DIR/install-meson-project.sh \
|
||||
"${OPTIONS[@]}" \
|
||||
https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas.git \
|
||||
master
|
||||
fi
|
||||
## Add necessary dependencies here, for example
|
||||
# if ! pkgconf --atleast-version 1.23.0 wayland-server
|
||||
# then
|
||||
# ./$SCRIPTS_DIR/install-meson-project.sh \
|
||||
# "${OPTIONS[@]}" \
|
||||
# https://gitlab.freedesktop.org/wayland/wayland.git \
|
||||
# 1.23.0
|
||||
# fi
|
||||
|
|
Loading…
Reference in a new issue