Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,9 @@ jobs:
runs-on: ubuntu-22.04
strategy:
matrix:
php: [ '7.4', '8.0', '8.1' ]
TYPO3: [ '11' ]
php: [ '8.1', '8.2', '8.3']
TYPO3: [ '12' ]
include:
- TYPO3: '12'
php: '8.1'
- TYPO3: '12'
php: '8.2'
- TYPO3: '12'
php: '8.3'
- TYPO3: '13'
php: '8.2'
- TYPO3: '13'
Expand Down Expand Up @@ -58,7 +52,7 @@ jobs:

- name: Acceptance Tests
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s acceptance -- --fail-fast
if: matrix.TYPO3 != '11' && matrix.TYPO3 != '14'
if: matrix.TYPO3 != '14'

- name: Archive acceptance tests results
uses: actions/upload-artifact@v4
Expand Down
6 changes: 3 additions & 3 deletions Build/Scripts/runTests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ Options:
- 11: Use TYPO3 v11.5
- 12 (default): Use TYPO3 v12.4
- 13: Use TYPO3 v13.x
- 14: Use TYPO3 14.0.x-dev
- 14: Use TYPO3 v14.x

-a <mysqli|pdo_mysql>
Only with -s functional|functionalDeprecated
Expand Down Expand Up @@ -603,7 +603,7 @@ case ${TEST_SUITE} in
composer require typo3/cms-core:^13.4 typo3/testing-framework:^8.2 phpunit/phpunit:^10.5 ichhabrecht/content-defender --dev -W --no-progress --no-interaction
composer prepare-tests
elif [ ${TYPO3} -eq 14 ]; then
composer require typo3/cms-core:14.0.x-dev --dev -W --no-progress --no-interaction
composer require typo3/cms-core:^14.0 --dev -W --no-progress --no-interaction
composer prepare-tests
else
composer require typo3/cms-core:^12.4 typo3/testing-framework:^8.2 phpunit/phpunit:^10.5 ichhabrecht/content-defender --dev -W --no-progress --no-interaction
Expand All @@ -625,7 +625,7 @@ case ${TEST_SUITE} in
composer require typo3/cms-core:^11.5 ichhabrecht/content-defender --dev -W --no-progress --no-interaction
composer prepare-tests
elif [ ${TYPO3} -eq 14 ]; then
composer require typo3/cms-core:14.0.x-dev --dev -W --no-progress --no-interaction
composer require typo3/cms-core:^14.0 --dev -W --no-progress --no-interaction
composer prepare-tests
elif [ ${TYPO3} -eq 13 ]; then
composer require typo3/cms-core:^13.4 ichhabrecht/content-defender --dev -W --no-progress --no-interaction
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"homepage": "https://b13.com",
"license": ["GPL-2.0-or-later"],
"require": {
"typo3/cms-backend": "^11.5 || ^12.4 || ^13.4 || 14.0.x-dev"
"typo3/cms-backend": "^11.5 || ^12.4 || ^13.4 || ^14.0"
},
"autoload": {
"psr-4": {
Expand All @@ -30,10 +30,10 @@
},
"require-dev": {
"b13/container-example": "dev-master",
"typo3/cms-install": "^11.5 || ^12.4 || ^13.4 || 14.0.x-dev",
"typo3/cms-fluid-styled-content": "^11.5 || ^12.4 || ^13.4 || 14.0.x-dev",
"typo3/cms-info": "^11.5 || ^12.4 || ^13.4 || 14.0.x-dev",
"typo3/cms-workspaces": "^11.5 || ^12.4 || ^13.4 || 14.0.x-dev",
"typo3/cms-install": "^11.5 || ^12.4 || ^13.4 || ^14.0",
"typo3/cms-fluid-styled-content": "^11.5 || ^12.4 || ^13.4 || ^14.0",
"typo3/cms-info": "^11.5 || ^12.4 || ^13.4 || ^14.0",
"typo3/cms-workspaces": "^11.5 || ^12.4 || ^13.4 || ^14.0",
"typo3/testing-framework": "^7.1.1 || ^8.2.7 || ^9.1",
"phpstan/phpstan": "^1.10",
"typo3/coding-standards": "^0.5.5",
Expand Down
Loading