diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2947a8406..ce5632530 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -106,13 +106,14 @@ variables: - .skip-git-clone variables: FDO_DISTRIBUTION_VERSION: 41 - BASE_TAG: '2025-02-04.0' + BASE_TAG: '2025-02-04.1' MUTTER_USER: 'meta-user' FDO_DISTRIBUTION_PACKAGES: + accountsservice-devel clang gcovr - gdm gnome-shell + itstool python3-docutils sassc uncrustify diff --git a/.gitlab-ci/install-common-dependencies.sh b/.gitlab-ci/install-common-dependencies.sh index 57d8ae8b8..d27f7b4a6 100755 --- a/.gitlab-ci/install-common-dependencies.sh +++ b/.gitlab-ci/install-common-dependencies.sh @@ -50,6 +50,29 @@ pip_install() { done } +check_gsettings_key() { + local schema=$1 + local key=$2 + + local rv=0 + + for destdir in "${DESTDIRS[@]}"; do + local schemadir=$(realpath $destdir/usr/share/glib-2.0/schemas/) + local targetdir=$(mktemp --directory) + + if ! glib-compile-schemas --targetdir $targetdir $schemadir 2>/dev/null ||\ + ! env -i "XDG_DATA_DIRS=/dev/null" \ + gsettings --schemadir $targetdir get $schema $key >/dev/null 2>&1 + then + rv=1 + fi + + rm -rf $targetdir + done + + return $rv +} + TEMP=$(getopt \ --name=$(basename $0) \ --options='h' \ @@ -110,3 +133,11 @@ then fi pip_install argcomplete + +if ! check_gsettings_key org.gnome.login-screen banner-message-source +then + ./$SCRIPTS_DIR/install-meson-project.sh \ + "${OPTIONS[@]}" \ + https://gitlab.gnome.org/GNOME/gdm.git \ + main +fi