From 55ec552d3cf2357a04cdce117ea1da324c5746af Mon Sep 17 00:00:00 2001
From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 8 Jun 2021 08:58:42 +0200
Subject: [PATCH] ci: try cpio everywhere we try tar

---
 .github/workflows/ci.yml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index efad5d6ae..533b726aa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,6 +23,7 @@ jobs:
         format:
           - directory
           - tar
+          - cpio
           - gpt_ext4
           - gpt_xfs
           - gpt_btrfs
@@ -84,13 +85,15 @@ jobs:
         sudo python3 -m mkosi build
 
     - name: Boot ${{ matrix.distro }}/${{ matrix.format }}
-      if: matrix.format != 'tar'
+      if: matrix.format != 'tar' &&
+          matrix.format != 'cpio'
       run: sudo ./tests/pexpect/boot.py python3 -m mkosi boot
 
     - name: Build ${{ matrix.distro }}/${{ matrix.format }} UEFI UKI
       if: matrix.format != 'directory' &&
           matrix.format != 'plain_squashfs' &&
-          matrix.format != 'tar'
+          matrix.format != 'tar' &&
+          matrix.format != 'cpio'
       run: |
         tee mkosi.default <<- EOF
         [Output]
@@ -108,13 +111,15 @@ jobs:
           matrix.format != 'plain_squashfs' &&
           matrix.format != 'gpt_squashfs' &&
           matrix.format != 'tar' &&
+          matrix.format != 'cpio' &&
           !(matrix.distro == 'ubuntu' && matrix.format == 'gpt_squashfs')
       run: sudo ./tests/pexpect/boot.py python3 -m mkosi qemu
 
     - name: Build ${{ matrix.distro }}/${{ matrix.format }} UEFI
       if: matrix.format != 'directory' &&
           matrix.format != 'plain_squashfs' &&
-          matrix.format != 'tar' && (
+          matrix.format != 'tar' &&
+          matrix.format != 'cpio' && (
           matrix.distro == 'arch' ||
           matrix.distro == 'centos' ||
           matrix.distro == 'fedora')
@@ -136,6 +141,7 @@ jobs:
     - name: Boot ${{ matrix.distro }}/${{ matrix.format }} UEFI
       if: matrix.format != 'directory' &&
           matrix.format != 'plain_squashfs' &&
+          matrix.format != 'cpio' &&
           matrix.format != 'tar' && (
           matrix.distro == 'arch' ||
           matrix.distro == 'centos' ||
@@ -146,7 +152,8 @@ jobs:
       if: matrix.format != 'directory' &&
           matrix.format != 'gpt_squashfs' &&
           matrix.format != 'plain_squashfs' &&
-          matrix.format != 'tar'
+          matrix.format != 'tar' &&
+          matrix.format != 'cpio'
       run: |
         tee mkosi.default <<- EOF
         [Output]
@@ -164,5 +171,6 @@ jobs:
       if: matrix.format != 'directory' &&
           matrix.format != 'gpt_squashfs' &&
           matrix.format != 'plain_squashfs' &&
+          matrix.format != 'cpio' &&
           matrix.format != 'tar'
       run: sudo ./tests/pexpect/boot.py python3 -m mkosi qemu
-- 
2.47.2