Skip to content

Commit

Permalink
chore: CD-306297 Designated branch for TYPO3 11 with PHP >8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
sourcesoldier committed Mar 21, 2024
1 parent 73ae90a commit e4afe2d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 20 deletions.
16 changes: 3 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,9 @@ jobs:
strategy:
fail-fast: false
matrix:
typo3: [ ^8.7, ^9.5, ^10.4, ^11.5 ]
php: [ '7.4' ]
typo3: [ ^11.5 ]
php: [ '8.0', '8.2', '8.3' ]
experimental: [false]
include:
- typo3: ^11.5
php: '8.0'
experimental: false
- typo3: ^11.5
php: '8.2'
experimental: false
- typo3: ^11.5
php: '8.3'
experimental: false

continue-on-error: ${{ matrix.experimental }}

Expand Down Expand Up @@ -67,7 +57,7 @@ jobs:
if: matrix.typo3 == '^11.5' && matrix.php == '8.3'
run: |
export "UNIT_XML"=.Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTests-v10.xml
.Build/bin/phpunit --whitelist Classes --coverage-clover=unittest-coverage.clover --colors -c $UNIT_XML Tests
.Build/bin/phpunit --coverage-filter Classes --coverage-clover=unittest-coverage.clover --colors -c $UNIT_XML Tests
- name: Upload coverage results to Scrutinizer
if: matrix.typo3 == '^11.5' && matrix.php == '8.3'
Expand Down
13 changes: 6 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
"source": "https://github.com/AOEpeople/asdis"
},
"require": {
"php": "^7.4 | ^8.0 | ^8.2 | ^8.3",
"typo3/cms-core": "^8.7 || ^9.5 || ^10.4.14 || ^11.5",
"typo3/cms-extbase": "^8.7 || ^9.5 || ^10.4.14 || ^11.5",
"typo3/cms-backend": "^8.7 || ^9.5 || ^10.4.14 || ^11.5",
"typo3/cms-reports": "^8.7 || ^9.5 || ^10.4.14 || ^11.5",
"typo3/cms-frontend": "^8.7 || ^9.5 || ^10.4.14 || ^11.5"
"php": "^8.0 | ^8.2 | ^8.3",
"typo3/cms-core": "^11.5",
"typo3/cms-extbase": "^11.5",
"typo3/cms-backend": "^11.5",
"typo3/cms-reports": "^11.5",
"typo3/cms-frontend": "^11.5"
},
"require-dev": {
"typo3/testing-framework": "^7.0",
Expand Down Expand Up @@ -81,7 +81,6 @@
"[ -e ./.Build/vendor/symplify/easy-coding-standard/vendor/squizlabs/php_codesniffer/bin/phpcs ] || composer install",
"[ -d ./reports/php_checkstyle ] || mkdir -p reports/php_checkstyle/",
"./.code-quality/configure-checkstyle.sh",
"./.Build/vendor/symplify/easy-coding-standard/vendor/squizlabs/php_codesniffer/bin/phpcs -d memory_limit=1G --standard=PHPCompatibility --colors --ignore=*/.Build/* -p . --runtime-set testVersion 7.4",
"./.Build/vendor/symplify/easy-coding-standard/vendor/squizlabs/php_codesniffer/bin/phpcs -d memory_limit=1G --standard=PHPCompatibility --colors --ignore=*/.Build/* -p . --runtime-set testVersion 8.0",
"./.Build/vendor/symplify/easy-coding-standard/vendor/squizlabs/php_codesniffer/bin/phpcs -d memory_limit=1G --standard=PHPCompatibility --colors --ignore=*/.Build/* -p . --runtime-set testVersion 8.3"
],
Expand Down

0 comments on commit e4afe2d

Please sign in to comment.