diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index cebf183af4..4b5e6fe759 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -25,7 +25,7 @@ jobs: steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd - - uses: systemd/mkosi@e3642f81d3a7f8f9310c0c734b2ba9dd41e50e14 + - uses: systemd/mkosi@14d2d37a1923c03062f55454b2b61d0c64db6238 # 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 2cfb3dd182..c20aceeda9 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -39,7 +39,7 @@ jobs: GITHUB_ACTIONS_CONFIG_FILE: actionlint.yml ENABLE_GITHUB_PULL_REQUEST_SUMMARY_COMMENT: false - - uses: systemd/mkosi@e3642f81d3a7f8f9310c0c734b2ba9dd41e50e14 + - uses: systemd/mkosi@14d2d37a1923c03062f55454b2b61d0c64db6238 - 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 0cd3a565f9..4b4c0f00c1 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -167,7 +167,7 @@ jobs: steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd - - uses: systemd/mkosi@e3642f81d3a7f8f9310c0c734b2ba9dd41e50e14 + - uses: systemd/mkosi@14d2d37a1923c03062f55454b2b61d0c64db6238 # 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 8d77a78cba..a52f3be22f 100644 --- a/mkosi/mkosi.conf +++ b/mkosi/mkosi.conf @@ -1,7 +1,7 @@ # SPDX-License-Identifier: LGPL-2.1-or-later [Config] -MinimumVersion=commit:e3642f81d3a7f8f9310c0c734b2ba9dd41e50e14 +MinimumVersion=commit:14d2d37a1923c03062f55454b2b61d0c64db6238 Dependencies= initrd minimal-base diff --git a/tools/fetch-mkosi.py b/tools/fetch-mkosi.py index b18adf7bfa..186b1b52db 100755 --- a/tools/fetch-mkosi.py +++ b/tools/fetch-mkosi.py @@ -43,7 +43,7 @@ def read_config(): def commit_file(files: list[Path], commit: str, changes: str): message = '\n'.join(( - f'mkosi: update mkosi commit reference to {commit}', + f'mkosi: update mkosi ref to {commit}', '', changes))