From d6e9620d1e0196d83ddfa4f8365206aa89b3254f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 20 Mar 2025 14:42:18 +0100 Subject: [PATCH] ci: Rebase image to F42 Fedora has branched, and GNOME 48 updates have been landing; this seems like a good moment to rebase our CI image. Part-of: --- .gitlab-ci.yml | 2 +- .gitlab-ci/build-toolbox-image.sh | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 456e59569..641f315d0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,7 +40,7 @@ default: image: $MUTTER_CI_IMAGE variables: - MUTTER_CI_IMAGE: registry.gitlab.gnome.org/gnome/mutter/fedora/41:x86_64-2025-02-19.1 + MUTTER_CI_IMAGE: registry.gitlab.gnome.org/gnome/mutter/fedora/42:x86_64-2025-03-31.0 FDO_UPSTREAM_REPO: GNOME/gnome-shell BUNDLE: "extensions-git.flatpak" LINT_LOG: "eslint-report.xml" diff --git a/.gitlab-ci/build-toolbox-image.sh b/.gitlab-ci/build-toolbox-image.sh index e53e8c381..24f110aa6 100755 --- a/.gitlab-ci/build-toolbox-image.sh +++ b/.gitlab-ci/build-toolbox-image.sh @@ -33,6 +33,7 @@ build_container() { flatpak-spawn # run host commands flatpak # for host apps nautilus # FileChooser portal + adwaita-fonts-all # system fonts gnome-backgrounds # no blank background! ) local debug_packages=( @@ -53,9 +54,6 @@ build_container() { local srcdir=$(realpath $(dirname $0)) buildah copy --chmod 755 $build_cntr $srcdir/install-meson-project.sh /usr/libexec - buildah run $build_cntr /usr/libexec/install-meson-project.sh \ - https://gitlab.gnome.org/GNOME/adwaita-fonts.git main - # include convenience script for updating mutter dependency local update_mutter=$(mktemp) cat > $update_mutter <<-EOF