meson, ci: Bump Libadwaita version to 1.6.alpha
This requires building from source, so do that for ci.
This commit is contained in:
parent
78c837ab92
commit
fa2cf5a5f2
2 changed files with 13 additions and 3 deletions
|
@ -33,6 +33,13 @@ stages:
|
|||
|
||||
.Build Procedure: &build_procedure
|
||||
echo "== Building ==" &&
|
||||
git clone --depth 1 https://gitlab.gnome.org/GNOME/libadwaita.git &&
|
||||
cd libadwaita &&
|
||||
meson setup _build --prefix=/usr -Dtests=false -Dexamples=false &&
|
||||
meson compile -C _build &&
|
||||
meson install -C _build &&
|
||||
cd .. &&
|
||||
rm -rf libadwaita &&
|
||||
meson setup _build ${BUILD_OPTS} -Dprofile=development &&
|
||||
meson compile -C _build 2>&1 | tee compilation.log
|
||||
|
||||
|
@ -49,7 +56,7 @@ stages:
|
|||
# Should probably also switch away from 'rawhide',
|
||||
# to stable fedora branch as well.
|
||||
BRANCH_NAME: 'main'
|
||||
CONTAINER_TAG: '2024-05-19.0'
|
||||
CONTAINER_TAG: '2024-05-28.0'
|
||||
FEDORA_VERSION: rawhide
|
||||
# Derive FDO variables from this automatically.
|
||||
# DO NOT edit, instead change the variables above
|
||||
|
@ -73,8 +80,9 @@ build.container.fedora@x86_64:
|
|||
# Expiry sets fdo.expires on the image
|
||||
FDO_EXPIRES_AFTER: 8w
|
||||
# NOTES:
|
||||
# - gobject-introspection-devel is needed for gsettings-desktop-schemas
|
||||
# - most packages are needed for testing
|
||||
# - glibc-langpack-en is needed for sorting in run-style-check-diff.sh
|
||||
# - libsass-devel, sassc are needed for building libadwaita
|
||||
FDO_DISTRIBUTION_PACKAGES: >-
|
||||
@c-development @development-tools
|
||||
dnf5-plugins
|
||||
|
@ -86,6 +94,7 @@ build.container.fedora@x86_64:
|
|||
python3-dbusmock
|
||||
xorg-x11-server-Xvfb
|
||||
mesa-dri-drivers
|
||||
libsass-devel sassc
|
||||
FDO_DISTRIBUTION_EXEC: |-
|
||||
dnf builddep -y gnome-control-center && \
|
||||
dnf builddep -y gsettings-desktop-schemas && \
|
||||
|
@ -102,6 +111,7 @@ build.container.fedora@x86_64:
|
|||
meson compile -C _build && \
|
||||
meson install -C _build && \
|
||||
cd .. && \
|
||||
dnf builddep -y libadwaita && \
|
||||
dnf remove -y systemtap-runtime
|
||||
|
||||
##
|
||||
|
|
|
@ -143,7 +143,7 @@ gtk_dep = dependency(
|
|||
|
||||
libadwaita_dep = dependency(
|
||||
'libadwaita-1',
|
||||
version: '>= 1.5',
|
||||
version: '>= 1.6.alpha',
|
||||
required: false
|
||||
)
|
||||
# FIXME: this is a workaround because interactive-tests don't work with libadwaita as a subproject. See !1754
|
||||
|
|
Loading…
Add table
Reference in a new issue