Skip to content

Commit 376be64

Browse files
authored
Merge branch 'b13:master' into fix_sorting_in_page_for_translations
2 parents 639c6b0 + 71a2eb0 commit 376be64

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1067
-713
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,44 +28,44 @@ jobs:
2828
php: '8.3'
2929
steps:
3030
- name: Checkout
31-
uses: actions/checkout@v2
31+
uses: actions/checkout@v4
3232

3333
- name: Install testing system
3434
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s composerInstall
3535

3636
- name: Composer validate
37-
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -s composerValidate
37+
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s composerValidate
3838

3939
- name: Lint PHP
40-
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -s lint
40+
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s lint
4141

4242
- name: CGL
43-
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -s cgl -n
43+
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s cgl -n
4444

4545
- name: phpstan
4646
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s phpstan
4747

4848
- name: Unit Tests
49-
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -s unit
49+
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s unit
5050

5151
- name: Functional Tests v12/v11
5252
if: matrix.TYPO3 != '13'
5353
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s functional
5454

5555
- name: Functional Tests v13
5656
if: matrix.TYPO3 == '13'
57-
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s functional -e "--exclude-group=content_defender"
57+
run: PHPUNIT_EXCLUDE_GROUPS=content_defender Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s functional
5858

5959
- name: Acceptance Tests v12/v11
6060
if: matrix.TYPO3 != '13'
61-
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s acceptance -e --fail-fast
61+
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s acceptance -- --fail-fast
6262

6363
- name: Acceptance Tests v13
6464
if: matrix.TYPO3 == '13'
65-
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s acceptance -e "--fail-fast --skip-group=content_defender"
65+
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s acceptance -- --fail-fast --skip-group=content_defender
6666

6767
- name: Archive acceptance tests results
68-
uses: actions/upload-artifact@v2
68+
uses: actions/upload-artifact@v4
6969
if: always()
7070
with:
7171
name: acceptance-test-reports-${{ matrix.php }}-${{ matrix.TYPO3 }}

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
.Build/
22
Build/phpunit/.phpunit.result.cache
33
Build/testing-docker/.env
4+
Build/testing-docker/docker-compose.yml
45
var/
56
composer.lock
67
.php-cs-fixer.cache
78
.env
89
config
910
.idea
11+
.cache
12+
composer.json.orig
13+
composer.json.testing
14+
bck-runTests.sh

Build/LocalConfiguration.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?php
22

3+
/** @see Build/LocalConfiguration.php */
34
return [
45
'BE' => [
56
'debug' => true,

0 commit comments

Comments
 (0)