Skip to content

Commit 4f329c6

Browse files
committed
Merge branch 'release/5.0.0'
2 parents de0d20f + 9bfa11f commit 4f329c6

38 files changed

Lines changed: 3991 additions & 576 deletions

.gitattributes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/.github/ export-ignore
2+
/Build/ export-ignore
3+
/Tests/ export-ignore
4+
/.gitattributes export-ignore
5+
/.gitignore export-ignore

.github/workflows/ci.yml

Lines changed: 49 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -2,112 +2,86 @@ name: build
22

33
on:
44
push:
5-
branches: [ develop, master ]
5+
branches: [ develop, main ]
66
tags: [ '*' ]
77
pull_request:
88
branches: [ develop ]
99

1010
jobs:
11-
xliff:
12-
runs-on: ubuntu-20.04
1311

14-
name: XML Lint (Xliff)
12+
resources:
13+
name: Resources tests
14+
runs-on: ubuntu-22.04
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v3
1818

19-
- name: Install libxml2-utils
20-
run: sudo apt install libxml2-utils
19+
- name: Run the xliff lint
20+
run: Build/Scripts/additionalTests.sh -s lintXliff
2121

22-
- name: Running xmllint (Xliff)
23-
run: find Resources/Private/Language/ -name '*.xlf' -type f | xargs xmllint --noout --schema .Build/xliff-core-1.2-strict.xsd
22+
- name: Test documentation build
23+
run: Build/Scripts/additionalTests.sh -s buildDocumentation
2424

25-
lint:
26-
runs-on: ubuntu-20.04
27-
28-
strategy:
29-
matrix:
30-
php-versions: ['7.4']
31-
32-
name: Lint PHP ${{ matrix.php-versions }}
33-
steps:
34-
- name: Checkout
35-
uses: actions/checkout@v2
36-
37-
- name: Setup PHP
38-
uses: shivammathur/setup-php@v2
39-
with:
40-
php-version: ${{ matrix.php-versions }}
41-
42-
- name: Running php lint with ${{ matrix.php-versions }}
43-
run: errors=$(find . -name \*.php ! -path "./.Build/*" -exec php -d display_errors=stderr -l "{}" 2>&1 >/dev/null \;) && echo "${errors}" && test -z "${errors}"
44-
45-
phpunit:
46-
needs: lint
47-
48-
runs-on: ubuntu-20.04
25+
- name: Cleanup
26+
run: |
27+
Build/Scripts/runTests.sh -s clean ; \
28+
Build/Scripts/additionalTests.sh -s clean ; \
29+
git checkout composer.json
4930
50-
continue-on-error: ${{ matrix.env.experimental == true }}
31+
testsuite:
32+
name: All php tests
33+
runs-on: ubuntu-latest
5134
strategy:
52-
fail-fast: false
5335
matrix:
54-
env:
55-
- { php: 7.4, TYPO3_VERSION: ^11.0, TESTING_FRAMEWORK: ^6.6.2 }
56-
- { php: 7.4, TYPO3_VERSION: ^11.0, TESTING_FRAMEWORK: ^6.6.2, PREFER_LOWEST: "--prefer-lowest" }
57-
- { php: 7.4, TYPO3_VERSION: "dev-master", TESTING_FRAMEWORK: ^6.6.2, experimental: true }
58-
59-
env: ${{ matrix.env }}
60-
61-
name: Run unit and/or functional tests on TYPO3 ${{ matrix.env.TYPO3_VERSION }} with PHP${{ matrix.env.php }} and testing framework ${{ matrix.env.TESTING_FRAMEWORK }}
36+
php: [ '8.1', '8.2' ]
37+
packages:
38+
- core: '^12.0'
39+
framework: 'dev-main'
40+
prefer: ''
41+
- core: '^12.0'
42+
framework: 'dev-main'
43+
prefer: '--prefer-lowest'
6244
steps:
6345
- name: Checkout
64-
uses: actions/checkout@v2
46+
uses: actions/checkout@v3
6547

66-
- name: Setup PHP
67-
uses: shivammathur/setup-php@v2
68-
with:
69-
php-version: ${{ matrix.env.php }}
70-
tools: composer
71-
extensions: pdo, sqlite3
72-
73-
- name: Validate composer.json and composer.lock
74-
run: composer validate
48+
- name: Composer
49+
run: Build/Scripts/additionalTests.sh -p ${{ matrix.php }} -s lintPhp
7550

76-
- name: Cache dependencies
77-
uses: actions/cache@v1
78-
with:
79-
path: ~/.composer/cache
80-
key: dependencies-composer-${{ hashFiles('composer.json') }}
51+
- name: Composer install
52+
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -s composerInstall
8153

82-
- name: Ensure stability dev
83-
if: ${{ matrix.env.TYPO3_VERSION == 'dev-master' }}
54+
- name: Composer install core
8455
run: |
85-
composer config minimum-stability dev
86-
composer config prefer-stable true
56+
Build/Scripts/additionalTests.sh -p ${{ matrix.php }} \
57+
-s composerInstallPackage \
58+
-q "typo3/cms-core:${{ matrix.packages.core }}"
8759
88-
- name: Install TYPO3 core
89-
run: composer require typo3/cms-core="${TYPO3_VERSION}" ${PREFER_LOWEST};
60+
- name: Composer install framework
61+
run: |
62+
Build/Scripts/additionalTests.sh -p ${{ matrix.php }} \
63+
-s composerInstallPackage \
64+
-q "typo3/testing-framework:${{ matrix.packages.framework }}" \
65+
-o " --dev ${{ matrix.packages.prefer }}"
9066
91-
- name: Install testing framework ${{ matrix.env.TESTING_FRAMEWORK }}
92-
if: ${{ matrix.env.TESTING_FRAMEWORK }}
93-
run: composer require --dev typo3/testing-framework="${TESTING_FRAMEWORK}";
67+
- name: Composer validate
68+
run: Build/Scripts/runTests.sh -s composerValidate
9469

95-
- name: Reset composer.json
96-
run: git checkout composer.json;
70+
- name: Cleanup
71+
run: |
72+
Build/Scripts/runTests.sh -s clean
73+
Build/Scripts/additionalTests.sh -s clean
9774
9875
TERUpload:
99-
needs: [ xliff, lint, phpunit ]
76+
needs: [ resources, testsuite ]
10077
if: startsWith(github.ref, 'refs/tags/')
10178

102-
runs-on: ubuntu-latest
103-
104-
strategy:
105-
fail-fast: false
79+
runs-on: ubuntu-22.04
10680

10781
name: TYPO3 TER release
10882
steps:
10983
- name: Checkout
110-
uses: actions/checkout@v2
84+
uses: actions/checkout@v3
11185

11286
- name: Publish to TER
11387
uses: tomasnorre/typo3-upload-ter@v2

.gitignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
.cache/
2+
.idea/
3+
Build/
4+
bin/
5+
Documentation-GENERATED-temp/
6+
typo3temp/
7+
var/
8+
public/
9+
vendor/
10+
composer.lock

0 commit comments

Comments
 (0)