Skip to content

Commit 353c8a4

Browse files
committed
Merge branch 'release/7.0.0'
2 parents c598219 + 8397792 commit 353c8a4

38 files changed

Lines changed: 3205 additions & 581 deletions

.github/workflows/ci.yml

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ jobs:
2323
run: Build/Scripts/additionalTests.sh -s buildDocumentation
2424

2525
- name: Cleanup
26-
run: |
27-
Build/Scripts/runTests.sh -s clean
28-
Build/Scripts/additionalTests.sh -s clean
29-
git checkout composer.json
26+
run: Build/Scripts/additionalTests.sh -s clean
3027

3128
testsuite:
3229
name: All php tests
@@ -35,52 +32,61 @@ jobs:
3532
matrix:
3633
packages:
3734
- php: '8.2'
38-
core: '^13.0'
35+
core: '^14.0'
3936
framework: 'dev-main'
4037
prefer: ''
38+
testpath: 'Tests/Functional'
39+
4140
- php: '8.2'
42-
core: '^13.0'
41+
core: '^14.0'
4342
framework: 'dev-main'
4443
prefer: '--prefer-lowest'
44+
testpath: 'Tests/Functional'
45+
4546
- php: '8.3'
46-
core: '^13.0'
47+
core: '^14.0'
4748
framework: 'dev-main'
4849
prefer: ''
50+
testpath: 'Tests/Functional'
51+
4952
- php: '8.3'
50-
core: '^13.0'
53+
core: '^14.0'
5154
framework: 'dev-main'
5255
prefer: '--prefer-lowest'
56+
testpath: 'Tests/Functional'
57+
58+
- php: '8.4'
59+
core: '^14.0'
60+
framework: 'dev-main'
61+
prefer: ''
62+
testpath: 'Tests/Functional'
63+
64+
# - php: '8.4'
65+
# core: '^14.0'
66+
# framework: 'dev-main'
67+
# prefer: '--prefer-lowest'
68+
# testpath: 'Tests/Functional'
5369
steps:
5470
- name: Checkout
5571
uses: actions/checkout@v4
5672

5773
- name: Lint php
58-
run: |
59-
Build/Scripts/additionalTests.sh \
60-
-p ${{ matrix.packages.php }} \
61-
-s lintPhp
62-
63-
- name: Composer install
6474
run: |
6575
Build/Scripts/runTests.sh \
6676
-p ${{ matrix.packages.php }} \
67-
-s composerInstall
77+
-s lintPhp
6878
6979
- name: Composer install core
7080
run: |
71-
Build/Scripts/additionalTests.sh \
81+
Build/Scripts/runTests.sh \
7282
-p ${{ matrix.packages.php }} \
73-
-s composerInstallPackage \
74-
-q "typo3/cms-core:${{ matrix.packages.core }}" \
75-
-r " ${{ matrix.packages.prefer }}"
83+
-s composer require ${{ matrix.packages.prefer }} "typo3/cms-core:${{ matrix.packages.core }}"
7684
7785
- name: Composer install framework
7886
run: |
79-
Build/Scripts/additionalTests.sh \
87+
Build/Scripts/runTests.sh \
8088
-p ${{ matrix.packages.php }} \
81-
-s composerInstallPackage \
82-
-q "typo3/testing-framework:${{ matrix.packages.framework }}" \
83-
-r " --dev ${{ matrix.packages.prefer }}"
89+
-s composer require --dev ${{ matrix.packages.prefer }} "typo3/testing-framework:${{ matrix.packages.framework }}"
8490
8591
- name: Composer validate
8692
run: |
@@ -92,7 +98,6 @@ jobs:
9298
run: |
9399
Build/Scripts/runTests.sh -s clean
94100
Build/Scripts/additionalTests.sh -s clean
95-
git checkout composer.json
96101
97102
TERUpload:
98103
needs: [ resources, testsuite ]

.github/workflows/pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
docker run \
2424
--rm --user $(id -u) \
2525
-v ${PWD}:/project \
26-
ghcr.io/typo3-documentation/render-guides:latest render Documentation
26+
ghcr.io/typo3-documentation/render-guides:latest --config=Documentation
2727
echo '<html><head><meta http-equiv="refresh" content="0; url=./Index.html" /></head></html>' > Documentation-GENERATED-temp/index.html
2828
touch Documentation-GENERATED-temp/.nojekyll
2929

0 commit comments

Comments
 (0)