Skip to content

Commit

Permalink
Merge branch '5.2-dev' into a11y-fix-accordion-role
Browse files Browse the repository at this point in the history
  • Loading branch information
chmst authored Jan 18, 2025
2 parents 29111d5 + b337054 commit a9a836d
Show file tree
Hide file tree
Showing 3,627 changed files with 84,542 additions and 53,071 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 4 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ clone_folder: C:\projects\joomla-cms
environment:
PHPBuild: "x64"
matrix:
- php_ver_target: 8.0
- php_ver_target: 8.1


init:
- SET PATH=C:\Tools\php;%PATH%
Expand Down Expand Up @@ -40,7 +41,8 @@ install:
- choco install composer
- cd C:\projects\joomla-cms
- refreshenv
- composer install --no-progress --profile --ignore-platform-req=ext-sodium
- echo "TODO Ignore platform reqs till all composer dependencies are compatible with php 8.1"
- composer install --no-progress --profile --ignore-platform-req=ext-sodium --ignore-platform-reqs

hosts:
openldap: 127.0.0.1
Expand Down
172 changes: 42 additions & 130 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ steps:
path: /tmp/composer-cache
commands:
- composer validate --no-check-all --strict
- composer install --no-progress --no-suggest
- composer install --no-progress --ignore-platform-reqs

- name: phpcs
image: joomlaprojects/docker-images:php8.1
Expand All @@ -31,12 +31,12 @@ steps:
- ./libraries/vendor/bin/phpcs --extensions=php -p --standard=ruleset.xml .
- echo $(date)

- name: phan
image: joomlaprojects/docker-images:php7.4-ast
- name: phpstan
image: joomlaprojects/docker-images:php8.2
depends_on: [ phpcs ]
failure: ignore
commands:
- ./libraries/vendor/bin/phan
- ./libraries/vendor/bin/phpstan

- name: npm
image: node:20-bullseye-slim
Expand All @@ -49,34 +49,6 @@ steps:
commands:
- npm ci --unsafe-perm

- name: php72-unit
depends_on: [ phpcs ]
image: joomlaprojects/docker-images:php7.2
commands:
- php -v
- ./libraries/vendor/bin/phpunit --testsuite Unit

- name: php73-unit
depends_on: [ phpcs ]
image: joomlaprojects/docker-images:php7.3
commands:
- php -v
- ./libraries/vendor/bin/phpunit --testsuite Unit

- name: php74-unit
depends_on: [ phpcs ]
image: joomlaprojects/docker-images:php7.4
commands:
- php -v
- ./libraries/vendor/bin/phpunit --testsuite Unit

- name: php80-unit
depends_on: [ phpcs ]
image: joomlaprojects/docker-images:php8.0
commands:
- php -v
- ./libraries/vendor/bin/phpunit --testsuite Unit

- name: php81-unit
depends_on: [ phpcs ]
image: joomlaprojects/docker-images:php8.1
Expand All @@ -98,34 +70,6 @@ steps:
- php -v
- ./libraries/vendor/bin/phpunit --testsuite Unit

- name: php72-integration
depends_on: [ npm ]
image: joomlaprojects/docker-images:php7.2
commands:
- php -v
- ./libraries/vendor/bin/phpunit --testsuite Integration

- name: php73-integration
depends_on: [ npm ]
image: joomlaprojects/docker-images:php7.3
commands:
- php -v
- ./libraries/vendor/bin/phpunit --testsuite Integration

- name: php74-integration
depends_on: [ npm ]
image: joomlaprojects/docker-images:php7.4
commands:
- php -v
- ./libraries/vendor/bin/phpunit --testsuite Integration

- name: php80-integration
depends_on: [ npm ]
image: joomlaprojects/docker-images:php8.0
commands:
- php -v
- ./libraries/vendor/bin/phpunit --testsuite Integration

- name: php81-integration
depends_on: [ npm ]
image: joomlaprojects/docker-images:php8.1
Expand All @@ -147,34 +91,6 @@ steps:
- php -v
- ./libraries/vendor/bin/phpunit --testsuite Integration

- name: php72-integration-pgsql
depends_on: [ npm ]
image: joomlaprojects/docker-images:php7.2
commands:
- php -v
- ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist

- name: php73-integration-pgsql
depends_on: [ npm ]
image: joomlaprojects/docker-images:php7.3
commands:
- php -v
- ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist

- name: php74-integration-pgsql
depends_on: [ npm ]
image: joomlaprojects/docker-images:php7.4
commands:
- php -v
- ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist

- name: php80-integration-pgsql
depends_on: [ npm ]
image: joomlaprojects/docker-images:php8.0
commands:
- php -v
- ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist

- name: php81-integration-pgsql
depends_on: [ npm ]
image: joomlaprojects/docker-images:php8.1
Expand Down Expand Up @@ -212,7 +128,7 @@ steps:
- name: prepare_system_tests
depends_on:
- npm
image: joomlaprojects/docker-images:systemtests
image: joomlaprojects/docker-images:systemtests8.1
volumes:
- name: cypress-cache
path: /root/.cache/Cypress
Expand All @@ -226,7 +142,7 @@ steps:
- name: phpmin-system-mysql
depends_on:
- prepare_system_tests
image: joomlaprojects/docker-images:cypress
image: joomlaprojects/docker-images:cypress8.1
volumes:
- name: cypress-cache
path: /root/.cache/Cypress
Expand All @@ -235,81 +151,83 @@ steps:
commands:
- bash tests/System/drone-system-run.sh "$(pwd)" cmysql mysqli mysql

- name: phpmin-system-postgres
- name: phpmax-system-mysql
depends_on:
- prepare_system_tests
image: joomlaprojects/docker-images:cypress
- phpmin-system-mysql
image: joomlaprojects/docker-images:cypress8.2
volumes:
- name: cypress-cache
path: /root/.cache/Cypress
environment:
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
commands:
- bash tests/System/drone-system-run.sh "$(pwd)" cpostgres pgsql postgres
- bash tests/System/drone-system-run.sh "$(pwd)" cmysqlmax mysqli mysql
when:
event:
exclude:
- pull_request

- name: phpmax-system-mysql
- name: phpnext-system-mysql
depends_on:
- phpmin-system-mysql
- phpmin-system-postgres
- phpmax-system-mysql
image: joomlaprojects/docker-images:cypress8.3
volumes:
- name: cypress-cache
path: /root/.cache/Cypress
environment:
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
failure: ignore
commands:
- bash tests/System/drone-system-run.sh "$(pwd)" cmysqlmax mysqli mysql
- echo "This test is disabled because php next is not stable yet"
- exit 1
- bash tests/System/drone-system-run.sh "$(pwd)" cmysqlnext mysqli mysql
when:
event:
exclude:
- pull_request

- name: phpmax-system-postgres
- name: phpmin-system-postgres
depends_on:
- phpmin-system-mysql
- phpmin-system-postgres
image: joomlaprojects/docker-images:cypress8.3
- prepare_system_tests
image: joomlaprojects/docker-images:cypress8.1
volumes:
- name: cypress-cache
path: /root/.cache/Cypress
environment:
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
commands:
- bash tests/System/drone-system-run.sh "$(pwd)" cpostgresmax pgsql postgres
- bash tests/System/drone-system-run.sh "$(pwd)" cpostgres pgsql postgres
when:
event:
exclude:
- pull_request

- name: phpmin-system-mysql8
- name: phpmax-system-postgres
depends_on:
- phpmax-system-mysql
- phpmax-system-postgres
image: joomlaprojects/docker-images:cypress
- phpmin-system-postgres
image: joomlaprojects/docker-images:cypress8.2
volumes:
- name: cypress-cache
path: /root/.cache/Cypress
environment:
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
commands:
- bash tests/System/drone-system-run.sh "$(pwd)" cmysql8 mysqli mysql8
when:
event:
exclude:
- pull_request
- bash tests/System/drone-system-run.sh "$(pwd)" cpostgresmax pgsql postgres

- name: phpmax-system-mysql8
- name: phpnext-system-postgres
depends_on:
- phpmax-system-mysql
- phpmax-system-postgres
image: joomlaprojects/docker-images:cypress8.3
volumes:
- name: cypress-cache
path: /root/.cache/Cypress
environment:
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
failure: ignore
commands:
- bash tests/System/drone-system-run.sh "$(pwd)" cmysql8max mysqli mysql8
- echo "This test is disabled because php next is not stable yet"
- exit 1
- bash tests/System/drone-system-run.sh "$(pwd)" cpostgresnext pgsql postgres
when:
event:
exclude:
Expand All @@ -318,11 +236,11 @@ steps:
- name: artifacts-system-tests
image: joomlaprojects/docker-images:packager
depends_on:
- phpnext-system-mysql
- phpnext-system-postgres
- phpmax-system-mysql
- phpmax-system-mysql8
- phpmax-system-postgres
- phpmin-system-mysql
- phpmin-system-mysql8
- phpmin-system-postgres
environment:
WEB_SERVER:
Expand Down Expand Up @@ -370,14 +288,6 @@ volumes:

services:
- name: mysql
image: mysql:5.7
environment:
MYSQL_USER: joomla_ut
MYSQL_PASSWORD: joomla_ut
MYSQL_ROOT_PASSWORD: joomla_ut
MYSQL_DATABASE: test_joomla

- name: mysql8
image: mysql:8.0
command: ["--default-authentication-plugin=mysql_native_password"]
environment:
Expand All @@ -387,7 +297,7 @@ services:
MYSQL_DATABASE: test_joomla

- name: postgres
image: postgres:11-alpine
image: postgres:12-alpine
ports:
- 5432
environment:
Expand Down Expand Up @@ -472,7 +382,9 @@ steps:
- mkdir -p transfer
- date +%s > transfer/$MINORVERSION-time.txt
- git rev-parse origin/$MINORVERSION-dev > transfer/$MINORVERSION.txt
- php build/build.php --remote=origin/$MINORVERSION-dev --exclude-gzip --exclude-bzip2
- php build/build.php --remote=origin/$MINORVERSION-dev --exclude-gzip --disable-patch-packages
- mv build/tmp/packages/* transfer/
- php build/build.php --remote=origin/$MINORVERSION-dev --exclude-zip --exclude-gzip --exclude-bzip2 --debug-build
- mv build/tmp/packages/* transfer/

- name: upload
Expand All @@ -498,15 +410,15 @@ steps:
- rclone delete nightly:/home/devj/public_html/nightlies/ --include "Joomla_$MINORVERSION.*"
- rclone delete nightly:/home/devj/public_html/cache/com_content/
- rclone copy ./transfer/ nightly:/home/devj/public_html/nightlies/
- curl -i -X POST -H 'Content-Type:application/json' -d '{"text":"Nightly Build for [Joomla 4.4](https://developer.joomla.org/nightly-builds.html) successfully built."}' $MATTERMOST_NIGHTLY_HOOK
- curl -i -X POST -H 'Content-Type:application/json' -d '{"text":"Nightly Build for [Joomla 5.2](https://developer.joomla.org/nightly-builds.html) successfully built."}' $MATTERMOST_NIGHTLY_HOOK

- name: buildfailure
image: joomlaprojects/docker-images:packager
environment:
MATTERMOST_NIGHTLY_HOOK:
from_secret: mattermost_nightly_hook
commands:
- curl -i -X POST -H 'Content-Type:application/json' -d '{"text":"Nightly Build for [Joomla 4.4](https://developer.joomla.org/nightly-builds.html) FAILED to built."}' $MATTERMOST_NIGHTLY_HOOK
- curl -i -X POST -H 'Content-Type:application/json' -d '{"text":"Nightly Build for [Joomla 5.2](https://developer.joomla.org/nightly-builds.html) FAILED to build."}' $MATTERMOST_NIGHTLY_HOOK
when:
status:
- failure
Expand All @@ -520,6 +432,6 @@ trigger:

---
kind: signature
hmac: 0f965e69f4773b289498dd7e06d3031f9ad89038606a7ace3632766c47283045
hmac: 10ae86041b814459e0a4618a7fa2356480177af7966412cc050e9902e9384cbe

...
13 changes: 6 additions & 7 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ plugins/content/finder/* @hackwar
plugins/finder/* @hackwar

# Release Tools
build.xml @fancyFranci
build/build.php @rdeutz
build/bump.php @rdeutz
build/deleted_file_check.php @rdeutz
Expand All @@ -17,12 +16,12 @@ libraries/src/Installer/* @rdeutz
libraries/src/Updater/* @rdeutz

# Automated Testing
tests/* @hackwar @fancyFranci
tests/Unit/* @rdeutz @fancyFranci
.appveyor.yml @rdeutz @hackwar @fancyFranci
.drone.yml @rdeutz @hackwar @fancyFranci
phpunit.xml.dist @rdeutz @hackwar @fancyFranci
phpunit-pgsql.xml.dist @rdeutz @hackwar @fancyFranci
tests/* @hackwar @laoneo
tests/Unit/* @rdeutz @laoneo
.appveyor.yml @rdeutz @hackwar @laoneo
.drone.yml @rdeutz @hackwar @laoneo
phpunit.xml.dist @rdeutz @hackwar @laoneo
phpunit-pgsql.xml.dist @rdeutz @hackwar @laoneo

# Workflow
administrator/components/com_workflow/* @bembelimen @hleithner
Expand Down
Loading

0 comments on commit a9a836d

Please sign in to comment.