From 1e8b85e8589fc635e815fc627e20a7f650288cbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20B=C3=BCrk?= Date: Sat, 15 Oct 2022 21:24:00 +0200 Subject: [PATCH] [TASK] Avoid race condition on case-insensitive filesystems Case-insensitive filesystems cannot distinguish properly for file and folder names with different caseings. This leads to unforseable issues on these systems, like default partition on MacOS devices from apple or eventually Windows systems. This change configure phpcoverall and the chain explicitly to use folders for the files which differs from the default of `build/*` to avoid conflicts on case-insensitve filesystems and prepare for introduction of the upcoming implementation of TYPO3 core recommended `Build/` structure. --- .github/workflows/codecoverage.yml | 2 +- .gitignore | 1 - composer.json | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codecoverage.yml b/.github/workflows/codecoverage.yml index 984a233..5881597 100644 --- a/.github/workflows/codecoverage.yml +++ b/.github/workflows/codecoverage.yml @@ -65,7 +65,7 @@ jobs: - name: "Upload coverage results to Coveralls" env: COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: ./.Build/vendor/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v + run: ./.Build/vendor/bin/php-coveralls --coverage_clover=./.Build/logs/clover.xml --json_path=./.Build/logs/coveralls-upload.json -v strategy: fail-fast: false matrix: diff --git a/.gitignore b/.gitignore index 7b4e503..cb06dd5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ /.php-cs-fixer.cache /.phpunit.result.cache /Documentation-GENERATED-temp/ -/build /clover.xml /composer.lock /nbproject diff --git a/composer.json b/composer.json index a6784bf..157ed1d 100644 --- a/composer.json +++ b/composer.json @@ -127,7 +127,7 @@ ], "ci:coverage:merge": [ "@coverage:create-directories", - "@php tools/phpcov merge --clover=./build/logs/clover.xml ./.Build/coverage/" + "@php tools/phpcov merge --clover=./.Build/logs/clover.xml ./.Build/coverage/" ], "ci:coverage:unit": [ "@coverage:create-directories", @@ -168,7 +168,7 @@ "ci:tests:unit": ".Build/vendor/bin/phpunit -c .Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTests.xml Tests/Unit", "ci:ts:lint": "typoscript-lint -c Configuration/TsLint.yml --ansi -n --fail-on-warnings -vvv Configuration/TypoScript", "ci:yaml:lint": "find . ! -path '*.Build/*' ! -path '*node_modules/*' -regextype egrep -regex '.*.ya?ml$' | xargs -r php ./.Build/vendor/bin/yaml-lint", - "coverage:create-directories": "mkdir -p build/logs .Build/coverage", + "coverage:create-directories": "mkdir -p .Build/logs .Build/coverage", "docs:generate": [ "docker run --rm t3docs/render-documentation show-shell-commands > tempfile.sh; echo 'dockrun_t3rd makehtml' >> tempfile.sh; bash tempfile.sh; rm tempfile.sh" ],