diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 9595544ce4..3e1ffffb74 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -25,7 +25,7 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: systemd/mkosi@10544812b35a668d4aac9834c78ee8166e99bc78 + - uses: systemd/mkosi@5a476a92deca8ad54869e5d416217aa1bb137b25 # 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/linter.yml b/.github/workflows/linter.yml index 4bcb6801da..1a0bc39172 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -38,7 +38,7 @@ jobs: LINTER_RULES_PATH: .github/linters GITHUB_ACTIONS_CONFIG_FILE: actionlint.yml - - uses: systemd/mkosi@10544812b35a668d4aac9834c78ee8166e99bc78 + - uses: systemd/mkosi@5a476a92deca8ad54869e5d416217aa1bb137b25 - name: Check that tabs are not used in Python code run: sh -c '! git grep -P "\\t" -- src/core/generate-bpf-delegate-configs.py src/boot/generate-hwids-section.py src/ukify/ukify.py test/integration-tests/integration-test-wrapper.py' diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index 4f50feea08..5a5ea8d4f7 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -167,7 +167,7 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: systemd/mkosi@10544812b35a668d4aac9834c78ee8166e99bc78 + - uses: systemd/mkosi@5a476a92deca8ad54869e5d416217aa1bb137b25 # 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/mkosi/mkosi.conf b/mkosi/mkosi.conf index 8c1a08abab..4a2b72111b 100644 --- a/mkosi/mkosi.conf +++ b/mkosi/mkosi.conf @@ -1,7 +1,7 @@ # SPDX-License-Identifier: LGPL-2.1-or-later [Config] -MinimumVersion=commit:10544812b35a668d4aac9834c78ee8166e99bc78 +MinimumVersion=commit:5a476a92deca8ad54869e5d416217aa1bb137b25 Dependencies= exitrd initrd @@ -147,7 +147,6 @@ Credentials= tty.virtual.tty1.agetty.autologin=root tty.virtual.tty1.login.noauth=yes RuntimeBuildSources=yes -RuntimeScratch=no CPUs=2 TPM=yes VSock=yes diff --git a/test/integration-tests/integration-test-wrapper.py b/test/integration-tests/integration-test-wrapper.py index f923c4fbdd..e39742b453 100755 --- a/test/integration-tests/integration-test-wrapper.py +++ b/test/integration-tests/integration-test-wrapper.py @@ -584,7 +584,6 @@ def main() -> None: ), '--credential', f'systemd.unit-dropin.{args.unit}={shlex.quote(dropin)}', '--runtime-network=none', - '--runtime-scratch=no', *([f'--qemu-args=-rtc base={rtc}'] if rtc else []), *args.mkosi_args, '--firmware', firmware,