From 27689b569f54b4d64e6537f68ece0770811d235c Mon Sep 17 00:00:00 2001 From: Will Thompson Date: Thu, 17 Oct 2024 20:53:34 +0100 Subject: [PATCH 1/4] Revert "Revert "ci: Work around nested podman permissions issue"" This reverts commit c2d92223475b353ab9f55ba3bc04b3688d5d44f1. --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cc83b5f4..eeeb2f26 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,6 +16,9 @@ stages: # stable branch. FDO_DISTRIBUTION_TAG: '2024-06-10.01-main' FDO_DISTRIBUTION_VERSION: 40 + # Workaround for https://gitlab.gnome.org/Infrastructure/Infrastructure/-/issues/1247 + FDO_DISTRIBUTION_EXEC: | + rm -r /var/lib/gdm/.config # See also https://gitlab.freedesktop.org/freedesktop/ci-templates build.container.fedora@x86_64: -- GitLab From 2e4833e0d1d27016413d6c0abae17e2bb3238093 Mon Sep 17 00:00:00 2001 From: Will Thompson Date: Thu, 17 Oct 2024 20:47:51 +0100 Subject: [PATCH 2/4] Bump version to 48.alpha --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 2a3f82f1..811430ad 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('gnome-initial-setup', ['c'], - version: '47.2', + version: '48.alpha', license: 'GPL-2.0-or-later', meson_version: '>= 0.53.0', ) -- GitLab From f76f24702a9ecec5871e2a275544e558bd4ebd31 Mon Sep 17 00:00:00 2001 From: Will Thompson Date: Thu, 17 Oct 2024 20:49:41 +0100 Subject: [PATCH 3/4] ci: Update base image --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eeeb2f26..1d8ae841 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ include: - - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/b61a03cabbf308e81289f7aaaf0b5a80a34ffb99/templates/fedora.yml' + - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/593a0a5fe35a523a646a7efae5471c9759b8fba3/templates/fedora.yml' variables: FDO_UPSTREAM_REPO: gnome/gnome-initial-setup @@ -14,7 +14,7 @@ stages: # to the release number/branch to ensure that # a new image will be created, tailored for the # stable branch. - FDO_DISTRIBUTION_TAG: '2024-06-10.01-main' + FDO_DISTRIBUTION_TAG: '2024-10-17.01-main' FDO_DISTRIBUTION_VERSION: 40 # Workaround for https://gitlab.gnome.org/Infrastructure/Infrastructure/-/issues/1247 FDO_DISTRIBUTION_EXEC: | -- GitLab From 055a22957292147e19291f99eaead8cf0eaf61b5 Mon Sep 17 00:00:00 2001 From: Will Thompson Date: Fri, 18 Oct 2024 09:32:39 +0100 Subject: [PATCH 4/4] ci: Update to Fedora 42 This is the version that will be contemporary with GNOME 48. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1d8ae841..74d7cb37 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ stages: # a new image will be created, tailored for the # stable branch. FDO_DISTRIBUTION_TAG: '2024-10-17.01-main' - FDO_DISTRIBUTION_VERSION: 40 + FDO_DISTRIBUTION_VERSION: 42 # Workaround for https://gitlab.gnome.org/Infrastructure/Infrastructure/-/issues/1247 FDO_DISTRIBUTION_EXEC: | rm -r /var/lib/gdm/.config -- GitLab