diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index f00d511c9d..f3ebe4aaaf 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -25,7 +25,7 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: systemd/mkosi@5e739ef1ed02a4f3b6ae64e50a8ee186cbcb21c2 + - uses: systemd/mkosi@0d1143150835b21c1bfe64428df5f45b558280b1 # 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 8296ac20fb..c404169792 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -36,7 +36,7 @@ jobs: VALIDATE_ALL_CODEBASE: false VALIDATE_GITHUB_ACTIONS: true - - uses: systemd/mkosi@5e739ef1ed02a4f3b6ae64e50a8ee186cbcb21c2 + - uses: systemd/mkosi@0d1143150835b21c1bfe64428df5f45b558280b1 - name: Check that tabs are not used in Python code run: sh -c '! git grep -P "\\t" -- 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 aa82ee0d51..badcfa1daa 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -113,7 +113,7 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: systemd/mkosi@5e739ef1ed02a4f3b6ae64e50a8ee186cbcb21c2 + - uses: systemd/mkosi@0d1143150835b21c1bfe64428df5f45b558280b1 # 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 746a0651cf..4682332c16 100644 --- a/mkosi/mkosi.conf +++ b/mkosi/mkosi.conf @@ -1,7 +1,7 @@ # SPDX-License-Identifier: LGPL-2.1-or-later [Config] -MinimumVersion=commit:5e739ef1ed02a4f3b6ae64e50a8ee186cbcb21c2 +MinimumVersion=commit:0d1143150835b21c1bfe64428df5f45b558280b1 Dependencies= exitrd initrd diff --git a/tools/fetch-mkosi.py b/tools/fetch-mkosi.py index 175bb45990..b18adf7bfa 100755 --- a/tools/fetch-mkosi.py +++ b/tools/fetch-mkosi.py @@ -75,7 +75,7 @@ def update_mkosi(args): print(f'mkosi: commit {new_commit!s} is still fresh') return - cmd = ['git', '-C', args.dir.as_posix(), 'log', '--graph', + cmd = ['git', '-C', args.dir.as_posix(), 'log', '--graph', '--first-parent', '--no-merges', '--pretty=oneline', '--no-decorate', '--abbrev-commit', '--abbrev=10', f'{old_commit}..{new_commit}'] print(f"+ {shlex.join(cmd)}")