From 9005c3cb9a4c80fd14220d2a981e2671264045d1 Mon Sep 17 00:00:00 2001 From: Oliver Klee Date: Fri, 23 Aug 2024 19:26:32 +0200 Subject: [PATCH] [TASK] Streamline the coverage folders (#1432) --- .github/workflows/codecoverage.yml | 6 +++--- composer.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codecoverage.yml b/.github/workflows/codecoverage.yml index f7f07c9..5ae539a 100644 --- a/.github/workflows/codecoverage.yml +++ b/.github/workflows/codecoverage.yml @@ -75,12 +75,12 @@ jobs: run: "ls -lahR .Build/coverage/" - name: "Merge coverage results" run: composer ci:coverage:merge - - name: "Show merged coverage files" - run: "ls -lahR ./.Build/logs/" + - name: "Show generated coverage files" + run: "ls -lahR .Build/coverage/" - name: "Upload coverage results to Coveralls" env: COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: ./.Build/bin/php-coveralls --coverage_clover=./.Build/logs/clover.xml --json_path=./.Build/logs/coveralls-upload.json -v + run: .Build/bin/php-coveralls --coverage_clover=.Build/coverage/combined.xml --json_path=.Build/coverage/coveralls-upload.json -v strategy: fail-fast: false matrix: diff --git a/composer.json b/composer.json index b411301..42f606e 100644 --- a/composer.json +++ b/composer.json @@ -132,7 +132,7 @@ ], "ci:coverage:merge": [ "@coverage:create-directories", - "@php tools/phpcov merge --clover=./.Build/logs/clover.xml ./.Build/coverage/" + "@php tools/phpcov merge --clover=.Build/coverage/combined.xml .Build/coverage/" ], "ci:coverage:unit": [ "@coverage:create-directories", @@ -170,7 +170,7 @@ "ci:typoscript:lint": "typoscript-lint -c Configuration/TsLint.yml --ansi -n --fail-on-warnings -vvv Configuration/TypoScript", "ci:xliff:lint": "php Build/xliff/xliff-lint lint:xliff Resources/Private/Language", "ci:yaml:lint": "find . ! -path '*.Build/*' ! -path '*node_modules/*' \\( -name '*.yaml' -o -name '*.yml' \\) | xargs -r php ./.Build/bin/yaml-lint", - "coverage:create-directories": "mkdir -p .Build/logs .Build/coverage", + "coverage:create-directories": "mkdir -p .Build/coverage", "docs:generate": "docker run --rm --pull always -v $(pwd):/project -it ghcr.io/typo3-documentation/render-guides:latest --config=Documentation", "fix:composer:normalize": "@composer normalize --no-check-lock", "fix:php": [