Skip to content

Commit

Permalink
Simplify CI setup
Browse files Browse the repository at this point in the history
Remove unnecessary complexity, e.g. version and matrix info which are
not used anyway.
Remove unnecessary modification of composer.json by not calling
`composer require` anymore.

This solves a broken Functional Tests because we no longer modify
composer.json to include a dependency to typo3/cms-fluid-styled-content.
  • Loading branch information
DanielSiepmann committed Apr 17, 2024
1 parent 694f7a8 commit 8b2ac08
Showing 1 changed file with 3 additions and 13 deletions.
16 changes: 3 additions & 13 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,8 @@ jobs:
matrix:
include:
- php-version: '8.1'
typo3-version: '^12.4'
- php-version: '8.2'
typo3-version: '^12.4'
- php-version: '8.3'
typo3-version: '^12.4'
steps:
- uses: actions/checkout@v4

Expand All @@ -95,8 +92,7 @@ jobs:
tools: composer:v2

- name: Install dependencies with expected TYPO3 version
run: |-
composer require --no-interaction --prefer-dist --no-progress "typo3/cms-core:${{ matrix.typo3-version }}" "typo3/cms-extbase:${{ matrix.typo3-version }}" "typo3/cms-frontend:${{ matrix.typo3-version }}" "typo3/cms-fluid-styled-content:${{ matrix.typo3-version }}"
run: composer update --no-interaction --prefer-dist --no-progress

- name: Code Quality (by PHPStan)
run: ./vendor/bin/phpstan analyse
Expand All @@ -110,14 +106,8 @@ jobs:
matrix:
include:
- php-version: '8.1'
typo3-version: '^12.4'
db-version: '8'
- php-version: '8.2'
typo3-version: '^12.4'
db-version: '8'
- php-version: '8.3'
typo3-version: '^12.4'
db-version: '8'
steps:
- uses: actions/checkout@v4

Expand All @@ -130,7 +120,7 @@ jobs:
- name: Setup MySQL
uses: mirromutth/[email protected]
with:
mysql version: "${{ matrix.db-version }}"
mysql version: "8"
mysql database: 'typo3'
mysql root password: 'root'

Expand All @@ -141,7 +131,7 @@ jobs:
done
- name: Install dependencies
run: composer require --no-interaction --prefer-dist --no-progress "typo3/cms-backend:${{ matrix.typo3-version }}" "typo3/cms-core:${{ matrix.typo3-version }}" "typo3/cms-extbase:${{ matrix.typo3-version }}" "typo3/cms-frontend:${{ matrix.typo3-version }}" "typo3/cms-fluid-styled-content:${{ matrix.typo3-version }}"
run: composer update --no-interaction --prefer-dist --no-progress

- name: PHPUnit Tests
run: |-
Expand Down

0 comments on commit 8b2ac08

Please sign in to comment.