From d0c819d3a62279a013dcd2ab4fff6bfdd2a21903 Mon Sep 17 00:00:00 2001 From: Oliver Klee Date: Mon, 24 Oct 2022 18:26:02 +0200 Subject: [PATCH] [TASK] Avoid race condition on case-insensitive filesystems (#657) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Case-insensitive filesystems cannot distinguish properly for file and folder names with different casings. This leads to unforseeable 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. Co-authored-by: Stefan Bürk --- .github/workflows/codecoverage.yml | 2 +- .gitignore | 1 - CHANGELOG.md | 1 + composer.json | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codecoverage.yml b/.github/workflows/codecoverage.yml index 4bd511c..17320f0 100644 --- a/.github/workflows/codecoverage.yml +++ b/.github/workflows/codecoverage.yml @@ -70,7 +70,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 109bdb9..82beae8 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/CHANGELOG.md b/CHANGELOG.md index 4eba009..08c7c3c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ This project adheres to [Semantic Versioning](https://semver.org/). ### Removed ### Fixed +- Avoid race condition on case-insensitive filesystems (#657) ## 3.0.0 diff --git a/composer.json b/composer.json index 30dca5e..0195939 100644 --- a/composer.json +++ b/composer.json @@ -116,7 +116,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", @@ -157,7 +157,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" ],