Skip to content

Commit 2abe731

Browse files
vertexvaarvertexvaar
committed
[RELEASE] Version 12.4.0 with conditional event listener
Resolves: https://projekte.in2code.de/issues/61887 Releases: https://projekte.in2code.de/issues/50782 Releases: https://projekte.in2code.de/issues/52878 Releases: https://projekte.in2code.de/issues/57009 Releases: https://projekte.in2code.de/issues/59690 Releases: https://projekte.in2code.de/issues/60726 Releases: https://projekte.in2code.de/issues/60855 Releases: https://projekte.in2code.de/issues/61150 Releases: https://projekte.in2code.de/issues/61669 Related: https://projekte.in2code.de/issues/61670
2 parents ab0073f + c08d0fd commit 2abe731

File tree

260 files changed

+7515
-815
lines changed

Some content is hidden

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

260 files changed

+7515
-815
lines changed

‎.env

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
HOST_LOCAL=local.v12.in2publish-core.de
2+
HOST_FOREIGN=foreign.v12.in2publish-core.de
3+
MAIL_HOST=mail.v12.in2publish-core.de
4+
5+
SQLPORT=12601
6+
7+
TYPO3_INSTALL_DB_DRIVER=mysqli
8+
TYPO3_INSTALL_DB_USER=app
9+
TYPO3_INSTALL_DB_PASSWORD=app
10+
TYPO3_INSTALL_DB_HOST=mysql
11+
TYPO3_INSTALL_DB_PORT=3306
12+
TYPO3_INSTALL_DB_USE_EXISTING=1
13+
TYPO3_INSTALL_DB_UNIX_SOCKET=""
14+
TYPO3_INSTALL_ADMIN_USER=testing-admin
15+
TYPO3_INSTALL_ADMIN_PASSWORD=Password-1
16+
TYPO3_INSTALL_SITE_SETUP_TYPE=site
17+
TYPO3_INSTALL_WEB_SERVER_CONFIG=apache
18+
19+
MYSQL_ROOT_PASSWORD=root
20+
MYSQL_PASSWORD=app
21+
MYSQL_USER=app
22+
23+
FOREIGN_DB_NAME=foreign
24+
FOREIGN_DB_USER=app
25+
FOREIGN_DB_PASS=app
26+
FOREIGN_DB_HOST=mysql
27+
FOREIGN_DB_PORT=3306
28+
29+
SQLDUMPSDIR=.project/data/dumps/
30+
FILESDIR=.project/data/fileadmin
31+
32+
SELENIUM_NODE_CHROME_VNC_PORT=22586
33+
SELENIUM_NODE_CHROME_NOVNC_PORT=22587
34+
SELENIUM_NODE_FIREFOX_VNC_PORT=22588
35+
SELENIUM_NODE_FIREFOX_NOVNC_PORT=22589

‎.gitattributes

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,14 @@
1717
/Makefile export-ignore
1818
/phive.xml export-ignore
1919

20+
/Tests/Browser/files/* filter=lfs diff=lfs merge=lfs -text
21+
/Tests/Manual/images/* filter=lfs diff=lfs merge=lfs -text
22+
2023
# Handle line endings automatically for files detected as text
2124
# and leave all files detected as binary untouched.
2225
* text=auto
2326

24-
# Enforce checkout with linux lf consistent over all plattforms
27+
# Enforce checkout with linux lf consistent over all platforms
2528
.* text eol=lf
2629
*.html text eol=lf
2730
*.css text eol=lf

‎.github/workflows/tests.yml

Lines changed: 94 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,108 @@ jobs:
1010
testsuite:
1111
name: all tests
1212
runs-on: ubuntu-20.04
13-
strategy:
14-
matrix:
15-
php: [ '7.4', '8.0' ]
16-
minMax: [ 'composerInstallMin', 'composerInstallMax' ]
13+
# strategy:
14+
# matrix:
15+
# php: [ '7.4', '8.0' ]
16+
# minMax: [ 'composerInstallMin', 'composerInstallMax' ]
1717
steps:
1818
- name: Checkout
1919
uses: actions/checkout@v2
2020

21-
- name: Composer
22-
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -s ${{ matrix.minMax }}
21+
- name: Add local env vars
22+
run: echo "USER_ID=$(id -u)" >> .env; echo "GROUP_ID=$(id -g)" >> .env; echo "HOST_PWD=$(pwd)" >> .env; cat .env
2323

24-
- name: Composer validate
25-
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -s composerValidate
24+
- name: Copy docker compose file for CI
25+
run: cp .project/docker/docker-compose.ci.yaml docker-compose.yaml
2626

27-
- name: Lint PHP
28-
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -s lint
27+
- name: Docker Compose
28+
run: docker compose up -d
2929

30-
- name: Unit tests
31-
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -s unit
30+
- name: Show me what's up
31+
run: docker compose ps
3232

33-
- name: Functional tests with mariadb
34-
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -d mariadb -s functional
33+
- name: Show me what's defined
34+
run: printenv
35+
36+
- name: Show me what's defined inside
37+
run: docker compose exec local-php printenv
38+
39+
- name: Show me what's there
40+
run: ls -la
41+
42+
- name: Show me what's docker
43+
run: ls -la /var/run/docker.sock
44+
45+
- name: Composer Local
46+
run: docker exec -u$(id -u) in2publish_core-local-php-1 composer install
47+
48+
- name: Composer Foreign
49+
run: docker exec -u$(id -u) in2publish_core-foreign-php-1 composer install
50+
51+
- name: Wait for Database
52+
run: while ! docker compose exec -T mysql mysql -uroot -proot local -e "SELECT 1;" &> /dev/null; do echo "Waiting for database ..."; sleep 3; done;
53+
54+
- name: TYPO3 Setup Local
55+
run: docker exec -u$(id -u) in2publish_core-local-php-1 vendor/bin/typo3 install:setup --force
56+
57+
- name: TYPO3 Setup Foreign
58+
run: docker exec -u$(id -u) in2publish_core-foreign-php-1 vendor/bin/typo3 install:setup --force
59+
60+
- name: Restore site configurations after setup
61+
run: git checkout Build/local/config/sites/main/config.yaml && git checkout Build/foreign/config/sites/main/config.yaml
62+
63+
- name: Restore DB Local
64+
run: docker exec -u$(id -u) in2publish_core-local-php-1 vendor/bin/mysql-loader import -Hmysql -uroot -proot -Dlocal -f/.project/data/dumps/local/
65+
66+
- name: Restore DB Foreign
67+
run: docker exec -u$(id -u) in2publish_core-local-php-1 vendor/bin/mysql-loader import -Hmysql -uroot -proot -Dforeign -f/.project/data/dumps/foreign/
68+
69+
- name: Show me what's up 2
70+
run: docker compose ps
71+
72+
- name: Unit Tests
73+
run: docker exec -u$(id -u) in2publish_core-local-php-1 vendor/bin/phpunit -c /app/phpunit.unit.xml --testdox
74+
if: always()
75+
76+
- name: Functional Tests
77+
run: docker exec -u$(id -u) in2publish_core-local-php-1 vendor/bin/phpunit -c /app/phpunit.functional.xml --testdox
78+
if: always()
79+
80+
- name: Acceptance Tests
81+
run: docker exec -u$(id -u) in2publish_core-local-php-1 vendor/bin/phpunit -c /app/phpunit.browser.xml --testdox
82+
if: always()
83+
84+
- name: Show me what's up 3
85+
run: docker compose ps
86+
if: always()
87+
88+
- name: Show me what's logged
89+
run: docker compose logs
90+
if: always()
91+
92+
- name: Shut down to finish video recording
93+
run: docker compose down
94+
if: always()
95+
96+
- name: Upload test artifacts
97+
uses: actions/upload-artifact@v3
98+
if: always()
99+
with:
100+
name: test-artifacts
101+
path: |
102+
.project/artifacts
103+
104+
# - name: Composer validate
105+
# run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -s composerValidate
106+
107+
# - name: Lint PHP
108+
# run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -s lint
109+
110+
# - name: Unit tests
111+
# run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -s unit
112+
113+
# - name: Functional tests with mariadb
114+
# run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -d mariadb -s functional
35115

36116
# - name: Functional tests with mssql
37117
# run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -d mssql -s functional

‎.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ Resources/Private/Clickdummy/typo3_src-6.2.9
1616
Resources/Private/Clickdummy/zextensions.css
1717

1818
# Generated
19-
.Build
2019
.project/phars
20+
.project/temp
21+
.project/artifacts
2122
Build/testing-docker/.env
2223
Build/.phpunit.result.cache
2324
.php-cs-fixer.cache
2425
composer.lock
26+
docker-compose.yaml

0 commit comments

Comments
 (0)