summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2023-09-04 13:26:39 +0200
committerDaan De Meyer <daan.j.demeyer@gmail.com>2023-09-04 13:53:16 +0200
commit16173ab1aa0e8d1032fa477178efe5957a47e5e4 (patch)
tree81646a35fa43079b9177a8b038507771babab89c
parentMerge pull request #29055 from mrc0mmand/bash-comp (diff)
downloadsystemd-16173ab1aa0e8d1032fa477178efe5957a47e5e4.tar.xz
systemd-16173ab1aa0e8d1032fa477178efe5957a47e5e4.zip
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.
-rw-r--r--.github/workflows/mkosi.yml14
1 files changed, 11 insertions, 3 deletions
diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 54a8481a5e..71bbf69992 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.