Skip to content

Commit eb97bbc

Browse files
committed
Merge branch 'release/9.0.0'
2 parents 4321ec1 + a26c23c commit eb97bbc

File tree

149 files changed

+22029
-17463
lines changed

Some content is hidden

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

149 files changed

+22029
-17463
lines changed

.crowdin.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
project_id_env: "CROWDIN_PROJECT_ID"
2+
api_token_env: "CROWDIN_PERSONAL_TOKEN"
3+
base_path: "."
4+
5+
preserve_hierarchy: true
6+
7+
files:
8+
- source: /Configuration/Sets/*/*.xlf
9+
translation: /%original_path%/%two_letters_code%.%original_file_name%
10+
ignore:
11+
- /**/%two_letters_code%.%original_file_name%
12+
13+
- source: /Resources/Private/Language/*.xlf
14+
translation: /Resources/Private/Language/%two_letters_code%.%file_name%.xlf
15+
ignore:
16+
- /**/%two_letters_code%.%original_file_name%

.github/workflows/ci.yml

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
uses: actions/checkout@v4
1818

1919
- name: Lint SCSS
20-
run: Build/Scripts/additionalTests.sh -s lintScss
20+
run: Build/Scripts/runTests.sh -s lintScss
2121

2222
- name: Lint Typescript
23-
run: Build/Scripts/additionalTests.sh -s lintTypescript
23+
run: Build/Scripts/runTests.sh -s lintTypescript
2424

2525
- name: Run the xliff lint
2626
run: Build/Scripts/additionalTests.sh -s lintXliff
@@ -29,10 +29,7 @@ jobs:
2929
run: Build/Scripts/additionalTests.sh -s buildDocumentation
3030

3131
- name: Cleanup
32-
run: |
33-
Build/Scripts/runTests.sh -s clean
34-
Build/Scripts/additionalTests.sh -s clean
35-
git checkout composer.json
32+
run: Build/Scripts/additionalTests.sh -s clean
3633

3734
testsuite:
3835
name: All php tests
@@ -41,50 +38,61 @@ jobs:
4138
matrix:
4239
packages:
4340
- php: '8.2'
44-
core: '^13.2'
41+
core: '^14.0'
4542
framework: 'dev-main'
4643
prefer: ''
4744
testpath: 'Tests/Functional'
45+
4846
- php: '8.2'
49-
core: '^13.2'
47+
core: '^14.0'
5048
framework: 'dev-main'
5149
prefer: '--prefer-lowest'
5250
testpath: 'Tests/Functional'
51+
5352
- php: '8.3'
54-
core: '^13.2'
53+
core: '^14.0'
5554
framework: 'dev-main'
5655
prefer: ''
5756
testpath: 'Tests/Functional'
57+
5858
- php: '8.3'
59-
core: '^13.2'
59+
core: '^14.0'
6060
framework: 'dev-main'
6161
prefer: '--prefer-lowest'
6262
testpath: 'Tests/Functional'
63+
64+
- php: '8.4'
65+
core: '^14.0'
66+
framework: 'dev-main'
67+
prefer: ''
68+
testpath: 'Tests/Functional'
69+
70+
# - php: '8.4'
71+
# core: '^14.0'
72+
# framework: 'dev-main'
73+
# prefer: '--prefer-lowest'
74+
# testpath: 'Tests/Functional'
6375
steps:
6476
- name: Checkout
6577
uses: actions/checkout@v4
6678

6779
- name: Lint php
6880
run: |
69-
Build/Scripts/additionalTests.sh \
81+
Build/Scripts/runTests.sh \
7082
-p ${{ matrix.packages.php }} \
7183
-s lintPhp
7284
7385
- name: Composer install core
7486
run: |
75-
Build/Scripts/additionalTests.sh \
87+
Build/Scripts/runTests.sh \
7688
-p ${{ matrix.packages.php }} \
77-
-s composerInstallPackage \
78-
-q "typo3/cms-core:${{ matrix.packages.core }}" \
79-
-r " ${{ matrix.packages.prefer }}"
89+
-s composer require ${{ matrix.packages.prefer }} "typo3/cms-core:${{ matrix.packages.core }}"
8090
81-
- name: Composer install testing framework
91+
- name: Composer install framework
8292
run: |
83-
Build/Scripts/additionalTests.sh \
93+
Build/Scripts/runTests.sh \
8494
-p ${{ matrix.packages.php }} \
85-
-s composerInstallPackage \
86-
-q "typo3/testing-framework:${{ matrix.packages.framework }}" \
87-
-r " --dev ${{ matrix.packages.prefer }}"
95+
-s composer require --dev ${{ matrix.packages.prefer }} "typo3/testing-framework:${{ matrix.packages.framework }}"
8896
8997
- name: Composer validate
9098
run: |
@@ -103,7 +111,6 @@ jobs:
103111
run: |
104112
Build/Scripts/runTests.sh -s clean
105113
Build/Scripts/additionalTests.sh -s clean
106-
git checkout composer.json
107114
108115
TERUpload:
109116
needs: [ resources, testsuite ]

.github/workflows/crowdin.yaml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Crowdin
2+
3+
on:
4+
workflow_dispatch:
5+
6+
push:
7+
branches:
8+
- develop
9+
paths:
10+
- '**.xlf'
11+
12+
jobs:
13+
sync:
14+
name: Synchronize with Crowdin
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v5
18+
19+
- name: Upload sources
20+
uses: crowdin/github-action@v2
21+
env:
22+
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
23+
with:
24+
config: '.crowdin.yml'
25+
project_id: ${{ secrets.CROWDIN_PROJECT_ID }}
26+
token: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
27+
crowdin_branch_name: 'develop'
28+
upload_sources: true
29+
upload_translations: false
30+
download_sources: false
31+
download_translations: true

.github/workflows/pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_dispatch:
55

66
push:
7-
branches: [ develop, main ]
7+
branches: [ main ]
88

99
permissions:
1010
contents: write

0 commit comments

Comments
 (0)