From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 7 Sep 2023 15:26:06 +0000 (+0200)
Subject: ci: Test cpio and uki boots in qemu
X-Git-Tag: v16~2^2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1881%2Fhead;p=thirdparty%2Fmkosi.git

ci: Test cpio and uki boots in qemu
---

diff --git a/.github/mkosi.conf.d/10-common.conf b/.github/mkosi.conf.d/10-common.conf
index 7a182eaf2..e612e0c44 100644
--- a/.github/mkosi.conf.d/10-common.conf
+++ b/.github/mkosi.conf.d/10-common.conf
@@ -6,7 +6,6 @@ KernelCommandLine=console=ttyS0
                   systemd.default_standard_output=journal+console
 
 [Content]
-Bootable=yes
 BiosBootloader=grub
 
 [Host]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5a0493bda..9c0650682 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -104,6 +104,7 @@ jobs:
           - tar
           - cpio
           - disk
+          - uki
 
     steps:
     - uses: actions/checkout@v3
@@ -142,8 +143,8 @@ jobs:
       if: matrix.format == 'disk' || matrix.format == 'directory'
       run: sudo mkosi --debug boot
 
-    - name: Boot ${{ matrix.distro }}/${{ matrix.format }} UEFI
-      if: matrix.format == 'disk'
+    - name: Boot ${{ matrix.distro }}/${{ matrix.format }} QEMU
+      if: matrix.format == 'disk' || matrix.format == 'uki' || matrix.format == 'cpio'
       run: timeout -k 30 10m mkosi --debug qemu
 
     - name: Boot ${{ matrix.distro }}/${{ matrix.format }} BIOS