From b10a0a4ad69541a2cbae9df643c67c3292930a25 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 27 Jan 2025 11:26:13 +0100 Subject: [PATCH 1/3] mkosi: Update to latest --- .github/workflows/coverage.yml | 2 +- .github/workflows/mkosi.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index e76794116b..7e2ba0f317 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -25,7 +25,7 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: systemd/mkosi@0df7ef3f404b211fbc8d856214929de10311ee22 + - uses: systemd/mkosi@0de0aa905625317ff10cc4b44ec9379a7aa65aa6 # 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 6f6df0ddf9..d662d65dad 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -120,7 +120,7 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: systemd/mkosi@0df7ef3f404b211fbc8d856214929de10311ee22 + - uses: systemd/mkosi@0de0aa905625317ff10cc4b44ec9379a7aa65aa6 # 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 From e9fb163857223da6ea020b0bfd12581e9ea707ae Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 27 Jan 2025 11:26:29 +0100 Subject: [PATCH 2/3] mkosi: Bump minimum version to 25 Let's require everyone to be on the now officially released mkosi 25. --- mkosi.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkosi.conf b/mkosi.conf index 559901dfff..63d36710ac 100644 --- a/mkosi.conf +++ b/mkosi.conf @@ -1,7 +1,7 @@ # SPDX-License-Identifier: LGPL-2.1-or-later [Config] -MinimumVersion=25~devel +MinimumVersion=25 Dependencies= exitrd initrd From 28f96afbbbc023ff9397ff8767d1faa1512abbc1 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 27 Jan 2025 11:27:49 +0100 Subject: [PATCH 3/3] mkosi: Add VCS_TAG to PassEnvironment= --- mkosi.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/mkosi.conf b/mkosi.conf index 63d36710ac..e4c866c9ba 100644 --- a/mkosi.conf +++ b/mkosi.conf @@ -23,6 +23,7 @@ PassEnvironment= WITH_DEBUG ASAN_OPTIONS COVERAGE + VCS_TAG [Output] RepartDirectories=mkosi.repart