mkosi: Update to latest

(cherry picked from commit ebcd568aa3b06e703f08c4b02460024fc2bdf0c5)

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 1cce9a97f38cb2d4c1a4de11d7ccb25433130b69..639bc2f7594725bc14efe8ad61cdf6faa1fdbfc9 100644 (file)
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      - uses: systemd/mkosi@d501139032aa659fa8d34bdb850f4eb6b5f458ed
+      - uses: systemd/mkosi@4519cfd9f5f4a32c96e4d4e0f2df7005b677057f
 
       # Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space
       # immediately, we remove the files in the background. However, we first move them to a different location

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 2b004982438efd3e1140aea0d31990c2e4b839a2..d6dee7b3a5d4cb5f2544513e3af8c77e25a2e589 100644 (file)
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -120,7 +120,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      - uses: systemd/mkosi@d501139032aa659fa8d34bdb850f4eb6b5f458ed
+      - uses: systemd/mkosi@4519cfd9f5f4a32c96e4d4e0f2df7005b677057f
 
       # Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space
       # immediately, we remove the files in the background. However, we first move them to a different location

diff --git a/test/integration-test-wrapper.py b/test/integration-test-wrapper.py
index 79348bbf62b3f8ab26cd0b4eae42233aba43a635..58860faa111ef12c84fb9494547475e1a5286205 100755 (executable)
--- a/test/integration-test-wrapper.py
+++ b/test/integration-test-wrapper.py
@@ -470,7 +470,7 @@ def main() -> None:
         '--output-dir', os.fspath(args.meson_build_dir / 'mkosi.output'),
         '--extra-search-path', os.fspath(args.meson_build_dir),
         '--machine', name,
-        '--ephemeral',
+        '--ephemeral=yes',
         *(['--forward-journal', journal_file] if journal_file else []),
         *(
             [