Skip to content

Commit 7d36f12

Browse files
committed
Merge branch 'release/11.1.0'
2 parents 44a17ae + 4af3b8c commit 7d36f12

File tree

65 files changed

+801
-887
lines changed

Some content is hidden

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

65 files changed

+801
-887
lines changed

.github/workflows/ci.yml

Lines changed: 73 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ jobs:
2020
run: Build/Scripts/additionalTests.sh -s buildDocumentation
2121

2222
- name: Cleanup
23-
run: |
24-
Build/Scripts/runTests.sh -s clean
25-
Build/Scripts/additionalTests.sh -s clean
23+
run: Build/Scripts/additionalTests.sh -s clean
2624

2725
testsuite:
2826
name: All php tests
@@ -33,49 +31,108 @@ jobs:
3331
- php: '8.2'
3432
core: '^13.0'
3533
framework: 'dev-main'
36-
path: 'Tests/Functional'
3734
prefer: ''
35+
testpath: 'Tests/Functional'
36+
3837
- php: '8.2'
3938
core: '^13.0'
4039
framework: 'dev-main'
41-
path: 'Tests/Functional'
4240
prefer: '--prefer-lowest'
41+
testpath: 'Tests/Functional'
42+
4343
- php: '8.3'
4444
core: '^13.0'
4545
framework: 'dev-main'
46-
path: 'Tests/Functional'
4746
prefer: ''
47+
testpath: 'Tests/Functional'
48+
4849
- php: '8.3'
4950
core: '^13.0'
5051
framework: 'dev-main'
51-
path: 'Tests/Functional'
5252
prefer: '--prefer-lowest'
53+
testpath: 'Tests/Functional'
54+
55+
- php: '8.4'
56+
core: '^13.0'
57+
framework: 'dev-main'
58+
prefer: ''
59+
testpath: 'Tests/Functional'
60+
61+
- php: '8.4'
62+
core: '^13.4'
63+
framework: 'dev-main'
64+
prefer: '--prefer-lowest'
65+
testpath: 'Tests/Functional'
66+
67+
- php: '8.2'
68+
core: '^14.0'
69+
framework: 'dev-main'
70+
prefer: ''
71+
testpath: 'Tests/Functional'
72+
73+
- php: '8.2'
74+
core: '^14.0'
75+
framework: 'dev-main'
76+
prefer: '--prefer-lowest'
77+
testpath: 'Tests/Functional'
78+
79+
- php: '8.3'
80+
core: '^14.0'
81+
framework: 'dev-main'
82+
prefer: ''
83+
testpath: 'Tests/Functional'
84+
85+
- php: '8.3'
86+
core: '^14.0'
87+
framework: 'dev-main'
88+
prefer: '--prefer-lowest'
89+
testpath: 'Tests/Functional'
90+
91+
- php: '8.4'
92+
core: '^14.0'
93+
framework: 'dev-main'
94+
prefer: ''
95+
testpath: 'Tests/Functional'
96+
97+
# - php: '8.4'
98+
# core: '^14.0'
99+
# framework: 'dev-main'
100+
# prefer: '--prefer-lowest'
101+
# testpath: 'Tests/Functional'
102+
103+
- php: '8.5'
104+
core: '^14.0'
105+
framework: 'dev-main'
106+
prefer: ''
107+
testpath: 'Tests/Functional'
108+
109+
# - php: '8.5'
110+
# core: '^14.0'
111+
# framework: 'dev-main'
112+
# prefer: '--prefer-lowest'
113+
# testpath: 'Tests/Functional'
53114

54115
steps:
55116
- name: Checkout
56117
uses: actions/checkout@v4
57118

58119
- name: PHP lint
59120
run: |
60-
Build/Scripts/additionalTests.sh \
121+
Build/Scripts/runTests.sh \
61122
-p ${{ matrix.packages.php }} \
62123
-s lintPhp
63124
64125
- name: Composer install core
65126
run: |
66-
Build/Scripts/additionalTests.sh \
127+
Build/Scripts/runTests.sh \
67128
-p ${{ matrix.packages.php }} \
68-
-s composerInstallPackage \
69-
-q "typo3/cms-core:${{ matrix.packages.core }}" \
70-
-r " ${{ matrix.packages.prefer }}"
129+
-s composer require ${{ matrix.packages.prefer }} "typo3/cms-core:${{ matrix.packages.core }}"
71130
72131
- name: Composer install framework
73132
run: |
74-
Build/Scripts/additionalTests.sh \
133+
Build/Scripts/runTests.sh \
75134
-p ${{ matrix.packages.php }} \
76-
-s composerInstallPackage \
77-
-q "typo3/testing-framework:${{ matrix.packages.framework }}" \
78-
-r " --dev ${{ matrix.packages.prefer }}"
135+
-s composer require --dev ${{ matrix.packages.prefer }} "typo3/testing-framework:${{ matrix.packages.framework }}"
79136
80137
- name: Composer validate
81138
run: |

0 commit comments

Comments
 (0)