Cleanup fix CI

DMKEBUSINESSGMBH · Oct 9, 2024 · e125b38 · e125b38
1 parent 29199c3
commit e125b38
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 21 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -19,10 +19,9 @@ jobs:
         strategy:
             matrix:
                 php-version:
-                    - "7.4"
-                    - "8.0"
                     - "8.1"
                     - "8.2"
+                    - "8.3"
 
         steps:
             -
@@ -71,9 +70,9 @@ jobs:
                     - "test:phpmd"
                     - "test:phpstan"
                 php-version:
-                    - "7.4"
-                    - "8.0"
                     - "8.1"
+                    - "8.2"
+                    - "8.3"
 
         steps:
             -
@@ -119,20 +118,20 @@ jobs:
             matrix:
                 include:
                     -
-                        typo3-version: "^11.5"
-                        php-version: "7.4"
-                    -
-                        typo3-version: "^11.5"
-                        php-version: "8.0"
-                    -
-                        typo3-version: "^11.5"
+                        typo3-version: "^12.4"
                         php-version: "8.1"
                     -
                         typo3-version: "^12.4"
-                        php-version: "8.1"
+                        php-version: "8.2"
                     -
                         typo3-version: "^12.4"
+                        php-version: "8.3"
+                    -
+                        typo3-version: "^13.0"
                         php-version: "8.2"
+                    -
+                        typo3-version: "^13.0"
+                        php-version: "8.3"
 
         steps:
             -

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ variables:
     PHPUNIT_OPTIONS: -c  $PHPUNIT_CONFIG_FILE --coverage-text --colors=never --log-junit=$JUNIT_LOG --coverage-clover=$COVERAGE_LOG --whitelist=$PHP_ANALYSE_PATHS $PHPUNIT_DIRECTORY
     ANALYSE_COVERAGE_MIN: '0.5'
     ANALYSE_COVERAGE_LAST_THRESHOLD: '5.0'
-    PHPCOMPATIBILITY_PHP_VERSIONS: '8.0,8.1,8.2,8.3'
+    PHPCOMPATIBILITY_PHP_VERSIONS: '8.1,8.2,8.3'
 
 sonarqube:
     allow_failure: true
diff --git a/composer.json b/composer.json
@@ -93,10 +93,7 @@
             "@test"
         ],
         "lint:php": [
-            "echo 'parallel-lint fails with a exception if executed inside the vendor/dmk/mkcontentai folder'",
-            "[ -e ../../autoload.php ] && mv ../../autoload.php ../../autoload.php.bak",
-            ".Build/bin/parallel-lint ./Classes",
-            "[ -e ../../autoload.php.bak ] && mv ../../autoload.php.bak ../../autoload.php"
+            ".Build/bin/parallel-lint ./Classes"
         ],
         "lint:yaml": [
             ".Build/bin/yaml-lint --ansi -n -v ./Configuration ./Resources"
@@ -117,14 +114,10 @@
             ".Build/bin/php-cs-fixer fix -v --dry-run --diff"
         ],
         "test:phpcompatibility": [
-            "@test:phpcompatibility:8.0",
             "@test:phpcompatibility:8.1",
             "@test:phpcompatibility:8.2",
             "@test:phpcompatibility:8.3"
         ],
-        "test:phpcompatibility:8.0": [
-            ".Build/bin/phpcs --ignore=.Build/*,Resources/Public/* -p . --standard=.Build/vendor/phpcompatibility/php-compatibility/PHPCompatibility --runtime-set testVersion 8.0"
-        ],
         "test:phpcompatibility:8.1": [
             ".Build/bin/phpcs --ignore=.Build/*,Resources/Public/* -p . --standard=.Build/vendor/phpcompatibility/php-compatibility/PHPCompatibility --runtime-set testVersion 8.1"
         ],