Skip to content

Commit e3ef9c8

Browse files
Merge pull request #2073 from nextcloud/fix/noid/server-versions-tested
Adjust server versions to be tested
2 parents 3857ef6 + a539aef commit e3ef9c8

File tree

15 files changed

+1971
-990
lines changed

15 files changed

+1971
-990
lines changed

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
strategy:
1818
matrix:
19-
php-versions: ['7.3', '7.4']
19+
php-versions: ['8.0', '8.1']
2020

2121
name: php${{ matrix.php-versions }}
2222
steps:
@@ -50,7 +50,7 @@ jobs:
5050
- name: Set up php
5151
uses: shivammathur/setup-php@v2
5252
with:
53-
php-version: 7.4
53+
php-version: 8.0
5454
coverage: none
5555
- name: Install dependencies
5656
run: composer i

.github/workflows/phpunit.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@ jobs:
1414
runs-on: ubuntu-latest
1515
strategy:
1616
matrix:
17-
php-versions: ['7.4']
18-
nextcloud-versions: ['stable23', 'stable24', 'master']
17+
php-versions: ['7.4', '8.0', '8.1']
18+
nextcloud-versions: ['stable23', 'stable24', 'stable25', 'master']
1919
include:
2020
- php-versions: '7.3'
2121
nextcloud-versions: 'stable23'
22-
# - php-versions: '8.0'
23-
# nextcloud-versions: 'master'
22+
exclude:
23+
- php-versions: '8.1'
24+
nextcloud-versions: 'stable23'
2425
name: php${{ matrix.php-versions }} on ${{ matrix.nextcloud-versions }} unit tests
2526
env:
2627
CI: true
@@ -52,11 +53,6 @@ jobs:
5253
- name: Enable app
5354
run: php -f nextcloud/occ app:enable tasks
5455

55-
- name: Downgrade phpunit for php7.2
56-
if: ${{ matrix.php-versions == '7.2' }}
57-
working-directory: nextcloud/apps/tasks
58-
run: composer update christophwurst/nextcloud_testing -W
59-
6056
- name: Install dependencies
6157
working-directory: nextcloud/apps/tasks
6258
run: composer install
File renamed without changes.

composer.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,17 @@
99
"email": "[email protected]"
1010
}
1111
],
12-
"require": {},
12+
"require": {
13+
"php": ">=7.3 <=8.1"
14+
},
1315
"require-dev": {
14-
"nextcloud/coding-standard": "^0.3.0",
15-
"phpunit/phpunit": "^7.5"
16+
"nextcloud/coding-standard": "^1.0.0",
17+
"phpunit/phpunit": "^9.5"
1618
},
1719
"config": {
20+
"platform": {
21+
"php": "7.4"
22+
},
1823
"optimize-autoloader": true,
1924
"classmap-authoritative": true
2025
},

0 commit comments

Comments
 (0)