Skip to content

Commit 6a4cdc7

Browse files
committed
ci: clean up ci matrix and include phpunit
Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>
1 parent 2f5a63e commit 6a4cdc7

4 files changed

Lines changed: 2105 additions & 446 deletions

File tree

.github/workflows/test.yml

Lines changed: 10 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,8 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
php-versions: ["7.4", "8.0", "8.1", "8.2"]
15-
nextcloud-versions: ["stable25"]
16-
include:
17-
- php-versions: 8.2
18-
nextcloud-versions: stable31
19-
- php-versions: 8.2
20-
nextcloud-versions: stable30
21-
- php-versions: 8.2
22-
nextcloud-versions: stable29
23-
- php-versions: 8.2
24-
nextcloud-versions: stable28
25-
- php-versions: 8.1
26-
nextcloud-versions: stable27
27-
- php-versions: 8.1
28-
nextcloud-versions: stable26
29-
- php-versions: 8.0
30-
nextcloud-versions: stable24
31-
- php-versions: 8.0
32-
nextcloud-versions: stable23
33-
- php-versions: 8.0
34-
nextcloud-versions: stable22
14+
php-versions: ["8.1", "8.2", "8.3", "8.4"]
15+
nextcloud-versions: ["stable32", "stable31", "stable30", "stable29"]
3516
name: Nextcloud ${{ matrix.nextcloud-versions }} php${{ matrix.php-versions }} unit tests
3617
steps:
3718
- name: Set up php${{ matrix.php-versions }}
@@ -42,9 +23,9 @@ jobs:
4223
coverage: xdebug
4324
- name: Checkout Nextcloud
4425
run: git clone https://github.com/nextcloud/server.git --recursive --depth 1 -b ${{ matrix.nextcloud-versions }} nextcloud
45-
- name: Patch version check for nightly PHP
46-
if: ${{ matrix.php-versions == '8.2' }}
47-
run: echo "<?php" > nextcloud/lib/versioncheck.php
26+
# - name: Patch version check for nightly PHP
27+
# if: ${{ matrix.php-versions == '8.2' }}
28+
# run: echo "<?php" > nextcloud/lib/versioncheck.php
4829
- name: Install Nextcloud
4930
run: php -f nextcloud/occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database sqlite --database-pass=''
5031
- name: Checkout qownnotesapi
@@ -53,17 +34,13 @@ jobs:
5334
path: nextcloud/apps/qownnotesapi
5435
- name: Test app
5536
run: php -f nextcloud/occ app:enable qownnotesapi && php -f nextcloud/occ background:cron
56-
# - name: Install dependencies
57-
# working-directory: nextcloud/apps/qownnotesapi
58-
# run: composer install
59-
# - name: PHPUnit tests
60-
# uses: php-actions/phpunit@v3
61-
# with:
62-
# configuration: phpunit.coverage.xml
37+
- name: Install dependencies
38+
working-directory: nextcloud/apps/qownnotesapi
39+
run: composer install
6340
- name: Run tests
6441
working-directory: nextcloud/apps/qownnotesapi
65-
run: composer global require phpunit/phpunit && phpunit -c phpunit.coverage.xml --coverage-clover build/logs/clover.xml
66-
if: ${{ matrix.php-versions == '8.0' }}
42+
run: composer test-coverage
43+
if: ${{ matrix.php-versions == '8.3' }}
6744
env:
6845
XDEBUG_MODE: coverage
6946
# - name: Report coverage

composer.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"vimeo/psalm": "^4.29",
44
"friendsofphp/php-cs-fixer": "^3.12",
55
"phpstan/phpstan": "^1.8",
6-
"nextcloud/coding-standard": "^1.1"
6+
"nextcloud/coding-standard": "^1.1",
7+
"phpunit/phpunit": "^9.6"
78
},
89
"scripts": {
910
"phpstan": [
@@ -22,6 +23,13 @@
2223
],
2324
"cs": [
2425
"@php vendor/bin/php-cs-fixer --ansi fix --dry-run --diff"
26+
],
27+
"test": [
28+
"@php vendor/bin/phpunit -c phpunit.coverage.xml"
29+
],
30+
"test-coverage": [
31+
"@putenv XDEBUG_MODE=coverage",
32+
"@php vendor/bin/phpunit -c phpunit.coverage.xml --coverage-clover build/logs/clover.xml"
2533
]
2634
}
2735
}

0 commit comments

Comments
 (0)