Skip to content

Commit 1b2fc1e

Browse files
committed
Merge remote-tracking branch 'upstream/5.3-dev' into 5.4-upmerge-2025-07-29
2 parents 3b844f2 + 96697bf commit 1b2fc1e

File tree

15 files changed

+165
-1575
lines changed

15 files changed

+165
-1575
lines changed

.appveyor.yml

Lines changed: 0 additions & 82 deletions
This file was deleted.

.github/CODEOWNERS

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@ libraries/src/Installer/* @rdeutz
1616
libraries/src/Updater/* @rdeutz
1717

1818
# Automated Testing
19+
.github/workflows/ci.yml @rdeutz @hackwar @laoneo
1920
tests/* @hackwar @laoneo
2021
tests/Unit/* @rdeutz @laoneo
21-
.appveyor.yml @rdeutz @hackwar @laoneo
2222
.drone.yml @rdeutz @hackwar @laoneo
2323
phpunit.xml.dist @rdeutz @hackwar @laoneo
2424
phpunit-pgsql.xml.dist @rdeutz @hackwar @laoneo
25+
phpunit-windows.xml.dist @rdeutz @hackwar @laoneo
2526

2627
# Workflow
2728
administrator/components/com_workflow/* @bembelimen @hleithner
@@ -51,6 +52,7 @@ installation/tmpl/* @chmst
5152

5253
# Translation GitHub Actions
5354
.github/workflows/create-translation-pull-request-v4.yml @hleithner
55+
.github/workflows/create-translation-pull-request-v5.yml @hleithner
5456

5557
# Libraries
5658
libraries/src/* @laoneo

.github/workflows/ci.yml

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,67 @@ jobs:
168168
POSTGRES_PASSWORD: joomla_ut
169169
POSTGRES_DB: test_joomla
170170

171+
tests-unit-windows:
172+
name: Run Unit tests (Windows)
173+
runs-on: windows-latest
174+
needs: [code-style-php]
175+
strategy:
176+
matrix:
177+
php_version: ['8.1', '8.2', '8.3', '8.4']
178+
steps:
179+
- uses: actions/checkout@v4
180+
- uses: actions/cache/restore@v4
181+
id: cache-php-windows
182+
with:
183+
path: libraries/vendor
184+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
185+
- name: Setup PHP
186+
uses: shivammathur/setup-php@v2
187+
with:
188+
php-version: ${{ matrix.php_version }}
189+
extensions: openssl, mbstring, fileinfo, gd, gmp, pgsql, mysql, mysqli, curl, opcache, ldap
190+
ini-values: post_max_size=256M, date.timezone="UTC"
191+
- name: Install Composer dependencies
192+
if: steps.cache-php-windows.outputs.cache-hit != 'true'
193+
run: composer install --no-progress --ignore-platform-reqs
194+
- name: Run Unit tests
195+
run: php libraries/vendor/bin/phpunit --testsuite Unit
196+
197+
tests-integration-windows:
198+
name: Run integration tests (Windows)
199+
runs-on: windows-latest
200+
needs: [code-style-php]
201+
strategy:
202+
matrix:
203+
php_version: ['8.1', '8.2', '8.3', '8.4']
204+
steps:
205+
- uses: actions/checkout@v4
206+
- uses: actions/cache/restore@v4
207+
with:
208+
path: libraries/vendor
209+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
210+
- uses: shogo82148/actions-setup-mysql@v1
211+
with:
212+
mysql-version: "mariadb-10.4"
213+
root-password: "joomla_ut"
214+
user: "joomla_ut"
215+
password: "joomla_ut"
216+
- name: Setup PHP
217+
uses: shivammathur/setup-php@v2
218+
with:
219+
php-version: ${{ matrix.php_version }}
220+
extensions: openssl, mbstring, fileinfo, gd, gmp, pgsql, mysql, mysqli, curl, opcache, ldap
221+
ini-values: post_max_size=256M, date.timezone="UTC"
222+
- name: Install Composer dependencies
223+
if: steps.cache-php-windows.outputs.cache-hit != 'true'
224+
run: |
225+
composer install --no-progress --ignore-platform-reqs
226+
mysql -uroot -pjoomla_ut -e 'CREATE DATABASE IF NOT EXISTS test_joomla;'
227+
- name: Run Integration tests
228+
run: |
229+
sleep 3
230+
php libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-windows.xml.dist
231+
171232
tests-system-prepare:
172233
name: Prepare system tests
173234
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)