From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 31 May 2024 08:23:58 +0000 (+0200)
Subject: mkosi: Drop two unnecessary settings in CI config
X-Git-Tag: v256-rc4~65^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e2219740f3eea8aec03cda3f7516797aa52f6fa0;p=thirdparty%2Fsystemd.git

mkosi: Drop two unnecessary settings in CI config

We don't build erofs images anymore and the firmware to use is set
per test so no need to configure it the CI config.
---

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index c990a6acf0e..9816719e9b1 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -111,8 +111,6 @@ jobs:
 
         [Content]
         Environment=
-                # mkfs.erofs is extremely noisy when not connected to a tty.
-                SYSTEMD_REPART_MKFS_OPTIONS_EROFS="--quiet"
                 # Build debuginfo packages since we'll be publishing the packages as artifacts.
                 WITH_DEBUG=1
                 # Enabling optimizations significantly speeds up integration tests.
@@ -121,8 +119,6 @@ jobs:
         [Host]
         ToolsTree=default
         ToolsTreeDistribution=fedora
-        # TODO: Drop once https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2038777 is fixed in Github Actions
-        QemuFirmware=uefi
         # We build with debuginfo so there's no point in mounting the sources into the machine.
         RuntimeBuildSources=no
         EOF