diff --git a/.gitattributes b/.gitattributes index 15a5c51ad..50ce0b6f2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,7 +4,6 @@ /.github export-ignore /.gitignore export-ignore /.php-cs-fixer.php export-ignore -/.scrutinizer.yml export-ignore /.styleci.yml export-ignore /Build/ export-ignore /CONTRIBUTING.md export-ignore diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 83bd58c53..c6a450678 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -164,11 +164,6 @@ jobs: echo "Current Size of EXT:Solr build Artefacts after run: " \ && sudo du -sh "${{ env.CI_BUILD_DIRECTORY }}" \ && sudo du -sh ${{ env.CI_BUILD_DIRECTORY }}/* - - - name: Upload code coverage to Scrutinizer - run: | - ocular code-coverage:upload --format=php-clover coverage.unit.clover - ocular code-coverage:upload --format=php-clover coverage.integration.clover - name: Clean up run: | diff --git a/.scrutinizer.yml b/.scrutinizer.yml deleted file mode 100644 index 17a118110..000000000 --- a/.scrutinizer.yml +++ /dev/null @@ -1,29 +0,0 @@ -filter: - excluded_paths: - - 'Documentation/*' - - 'Tests/*' - - 'Resources/Public/JavaScript/*' - - 'Resources/Private/Solr/*' - paths: - - 'Classes/*' - -tools: - php_cpd: - enabled: false - - # we do this on GitHub-Actions via typo3/coding-standards - php_code_sniffer: - enabled: false - # we do this on GitHub-Actions via typo3/coding-standards - php_cs_fixer: - enabled: false - - php_mess_detector: - enabled: false - - php_pdepend: - enabled: false - - external_code_coverage: - runs: 2 - timeout: 2400 diff --git a/Build/Test/bootstrap.sh b/Build/Test/bootstrap.sh index 426fde352..685bfdaa8 100755 --- a/Build/Test/bootstrap.sh +++ b/Build/Test/bootstrap.sh @@ -74,7 +74,7 @@ fi echo "Install third party tools globally:" export PATH=$PATH:$(composer config --global home)/vendor/bin -if ! composer global require sclable/xml-lint scrutinizer/ocular --ignore-platform-reqs +if ! composer global require sclable/xml-lint --ignore-platform-reqs then "The test environment could not be installed by composer as expected. Please fix this issue." exit 1 diff --git a/Build/Test/cibuild.sh b/Build/Test/cibuild.sh index d6aae6891..537d2b0c0 100755 --- a/Build/Test/cibuild.sh +++ b/Build/Test/cibuild.sh @@ -55,7 +55,7 @@ fi echo -e "\n\n" echo "Run unit tests" -if ! composer tests:unit -- --coverage-clover=coverage.unit.clover +if ! composer tests:unit then echo "Error during running the unit tests please check and fix them" EXIT_CODE=5 @@ -95,7 +95,7 @@ fi echo -e "\n\n" echo "Run integration tests" -if ! composer tests:integration -- --coverage-clover=coverage.integration.clover +if ! composer tests:integration then echo "Error during running the integration tests please check and fix them" EXIT_CODE=6 diff --git a/composer.json b/composer.json index 8a6632e60..5135618e2 100644 --- a/composer.json +++ b/composer.json @@ -158,8 +158,7 @@ "ext-solrfal": { }, "stack-for-ci": { - "sclable/xml-lint": "*", - "scrutinizer/ocular": "*" + "sclable/xml-lint": "*" } } }