From 76e5387da02cece9f8b7bb673d1c26606810c647 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Thu, 13 Feb 2025 19:56:34 +0100 Subject: [PATCH] mkosi: Update to latest (cherry picked from commit ebcd568aa3b06e703f08c4b02460024fc2bdf0c5) --- .github/workflows/coverage.yml | 2 +- .github/workflows/mkosi.yml | 2 +- test/integration-test-wrapper.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 1cce9a97f38..639bc2f7594 100644 --- 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 2b004982438..d6dee7b3a5d 100644 --- 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 79348bbf62b..58860faa111 100755 --- 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 []), *( [ -- 2.47.3