From c8233aa096340bc51c2bb2fe98306fa46aa113ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20T=C3=B6lle?= <mtoelle@typo3graf-media.de>
Date: Thu, 5 Jan 2023 23:20:34 +0100
Subject: [PATCH] [BUGFIX] fix folder structure for gitlab-ci
---
.gitlab-ci.yml | 2 +-
composer.json | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 97b8468..e3626f2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ include:
#- '/.gitlab/pipeline/jobs/func-php8.0-v11.yml'
#- '/.gitlab/pipeline/jobs/func-php8.1-v11.yml'
#- '/.gitlab/pipeline/jobs/javascript-lint.yml'
- - '/.gitlab/pipeline/jobs/json-lint.yml'
+ #- '/.gitlab/pipeline/jobs/json-lint.yml'
- '/.gitlab/pipeline/jobs/php-copypaste-check.yml'
- '/.gitlab/pipeline/jobs/php-lint-php8.0.yml'
- '/.gitlab/pipeline/jobs/php-lint-php8.1.yml'
diff --git a/composer.json b/composer.json
index 7bb51cf..a6f90bf 100644
--- a/composer.json
+++ b/composer.json
@@ -110,7 +110,7 @@
"ci:dynamic": [
"@ci:tests"
],
- "ci:json:lint": "find . ! -path '*.Build/*' ! -path '*node_modules/*' -name '*.json' | xargs -r php .Build/vendor/bin/jsonlint -q",
+ "ci:json:lint": "find . ! -path '*.Build/*' ! -path '*node_modules/*' -name '*.json' | xargs -r php .Build//jsonlint -q",
"ci:php": [
"@ci:php:copypaste",
"@ci:php:cs-fixer",
@@ -135,10 +135,10 @@
"@ci:tests:unit",
"@ci:tests:functional"
],
- "ci:tests:functional": "find 'Tests/Functional' -wholename '*Test.php' | parallel --gnu 'echo; echo \"Running functional test suite {}\"; .Build/vendor/bin/phpunit -c .Build/vendor/typo3/testing-framework/Resources/Core/Build/FunctionalTests.xml {}';",
- "ci:tests:unit": ".Build/vendor/bin/phpunit -c .Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTests.xml Tests/Unit",
+ "ci:tests:functional": "find 'Tests/Functional' -wholename '*Test.php' | parallel --gnu 'echo; echo \"Running functional test suite {}\"; .Build//phpunit -c .Build/vendor/typo3/testing-framework/Resources/Core/Build/FunctionalTests.xml {}';",
+ "ci:tests:unit": ".Build//phpunit -c .Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTests.xml Tests/Unit",
"ci:ts:lint": "typoscript-lint -c gitlab/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",
+ "ci:yaml:lint": "find . ! -path '*.Build/*' ! -path '*node_modules/*' -regextype egrep -regex '.*.ya?ml$' | xargs -r php ./.Build/bin/yaml-lint",
"fix:php": [
"@fix:php:cs",
"@fix:php:sniff"
--
GitLab