diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 812d8c6712a..81ba85fe27f 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -25,7 +25,7 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: systemd/mkosi@4519cfd9f5f4a32c96e4d4e0f2df7005b677057f + - uses: systemd/mkosi@13eb5b68bd5fb234dd0da3b242d80954faf91b95 # 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 d6dee7b3a5d..5f14be65998 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -120,7 +120,7 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: systemd/mkosi@4519cfd9f5f4a32c96e4d4e0f2df7005b677057f + - uses: systemd/mkosi@13eb5b68bd5fb234dd0da3b242d80954faf91b95 # 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/test/integration-test-wrapper.py b/test/integration-test-wrapper.py index 58860faa111..746c0f98d91 100755 --- a/test/integration-test-wrapper.py +++ b/test/integration-test-wrapper.py @@ -43,6 +43,7 @@ class Summary: release: str architecture: str builddir: Path + buildsubdir: Path environment: dict[str, str] @classmethod @@ -65,6 +66,7 @@ class Summary: release=j['Images'][-1]['Release'], architecture=j['Images'][-1]['Architecture'], builddir=Path(j['Images'][-1]['BuildDirectory']), + buildsubdir=Path(j['Images'][-1]['BuildSubdirectory']), environment=j['Images'][-1]['Environment'], ) @@ -298,7 +300,7 @@ def process_coverage(args: argparse.Namespace, summary: Summary, name: str, jour '--include=*/', '--include=*.gcno', '--exclude=*', - f'{os.fspath(args.meson_build_dir / summary.builddir)}/', + f'{os.fspath(summary.builddir / summary.buildsubdir)}/', os.fspath(Path(tmp) / 'work/build'), ], check=True,