From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 4 Sep 2023 11:26:39 +0000 (+0200)
Subject: mkosi: Re-enable arch but disable keyring checking
X-Git-Tag: v255-rc1~581^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=16173ab1aa0e8d1032fa477178efe5957a47e5e4;p=thirdparty%2Fsystemd.git

mkosi: Re-enable arch but disable keyring checking

No need to disable arch completely, let's just disable keyring checking
to get CI working again for now.
---

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 54a8481a5e8..71bbf699926 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -54,9 +54,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-# Temporarily disabled due to keyring packaging issues
-#          - distro: arch
-#            release: rolling
+          - distro: arch
+            release: rolling
           - distro: debian
             release: testing
           - distro: ubuntu
@@ -104,6 +103,15 @@ jobs:
         Ephemeral=yes
         EOF
 
+        # TODO: Remove once archlinux-keyring is updated in ppa:michel-slm/kernel-utils.
+        tee mkosi.conf.d/11-arch-keyring.conf <<- EOF
+        [Match]
+        Distribution=arch
+
+        [Distribution]
+        RepositoryKeyCheck=no
+        EOF
+
         # For erofs, we have to install linux-modules-extra-azure, but that doesn't match the running kernel
         # version, so we can't load the erofs module. squashfs is a builtin module so we use that instead.