diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index ef366657fc9..7a968ac95bb 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -27,7 +27,7 @@ jobs: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd with: persist-credentials: false - - uses: systemd/mkosi@9a28ad20bbea61894ea7b971d318a71f4374cf3b + - uses: systemd/mkosi@77fce77807a9a92bc37edc8f1c967102e6236d94 # 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 @@ -129,6 +129,10 @@ jobs: --max-lines 300 \ --quiet + - name: Fix journal ownership + if: failure() && (github.repository == 'systemd/systemd' || github.repository == 'systemd/systemd-stable') + run: sudo chown -R "$(id -u):$(id -g)" build/test/journal build/meson-logs + - name: Archive failed test journals uses: actions/upload-artifact@v7 if: failure() && (github.repository == 'systemd/systemd' || github.repository == 'systemd/systemd-stable') diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 048391836eb..36c0bc9e338 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -40,7 +40,7 @@ jobs: GITHUB_ACTIONS_CONFIG_FILE: actionlint.yml ENABLE_GITHUB_PULL_REQUEST_SUMMARY_COMMENT: false - - uses: systemd/mkosi@9a28ad20bbea61894ea7b971d318a71f4374cf3b + - uses: systemd/mkosi@77fce77807a9a92bc37edc8f1c967102e6236d94 - 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 55be6ab86b8..5ed49076658 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -169,7 +169,7 @@ jobs: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd with: persist-credentials: false - - uses: systemd/mkosi@9a28ad20bbea61894ea7b971d318a71f4374cf3b + - uses: systemd/mkosi@77fce77807a9a92bc37edc8f1c967102e6236d94 # 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 @@ -318,6 +318,10 @@ jobs: --num-processes "$(($(nproc) - 1))" \ "${MAX_LINES[@]}" + - name: Fix journal ownership + if: failure() && (github.repository == 'systemd/systemd' || github.repository == 'systemd/systemd-stable') + run: sudo chown -R "$(id -u):$(id -g)" build/test/journal build/meson-logs + - name: Archive failed test journals uses: actions/upload-artifact@v7 if: failure() && (github.repository == 'systemd/systemd' || github.repository == 'systemd/systemd-stable') diff --git a/mkosi/mkosi.conf b/mkosi/mkosi.conf index ca5c061079b..b807fdb3c50 100644 --- a/mkosi/mkosi.conf +++ b/mkosi/mkosi.conf @@ -1,7 +1,7 @@ # SPDX-License-Identifier: LGPL-2.1-or-later [Config] -MinimumVersion=commit:66d51024b7149f40be4702e84275c936373ace97 +MinimumVersion=commit:77fce77807a9a92bc37edc8f1c967102e6236d94 Dependencies= minimal-base minimal-0