Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat!: drop support for php 8.0 and nextcloud <= 29 #575

Merged
merged 4 commits into from
May 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 10 additions & 21 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-version: ['8.1', '8.2']
nextcloud-version: ['master', 'stable29', 'stable28', 'stable27']
include:
- php-version: '8.0'
nextcloud-version: stable27
- php-version: '8.0'
nextcloud-version: stable28
- php-version: '8.0'
nextcloud-version: stable29
- php-version: '8.3'
nextcloud-version: stable29
- php-version: '8.3'
nextcloud-version: master
php-version: ['8.1', '8.2', '8.3']
nextcloud-version: ['master']
name: Nextcloud ${{ matrix.nextcloud-version }} php${{ matrix.php-version }} unit tests
steps:
- name: Set up Nextcloud env
Expand Down Expand Up @@ -57,14 +46,11 @@ jobs:
- php-version: '8.1'
nextcloud-version: master
db: 'oci'
- php-version: '8.0'
nextcloud-version: stable27
db: 'pgsql'
- php-version: '8.0'
nextcloud-version: stable28
- php-version: '8.1'
nextcloud-version: master
db: 'pgsql'
- php-version: '8.2'
nextcloud-version: stable29
nextcloud-version: master
db: 'mysql'
name: Nextcloud ${{ matrix.nextcloud-version }} php${{ matrix.php-version }}-${{ matrix.db }} integration tests
services:
Expand Down Expand Up @@ -153,8 +139,8 @@ jobs:
name: Front-end E2E tests
strategy:
matrix:
php-version: [ '8.1' ]
nextcloud-version: [ 'master', 'stable29', 'stable28', 'stable27' ]
php-version: [ '8.1', '8.2', '8.3' ]
nextcloud-version: [ 'master']
node-version: [ '20' ]
steps:
- name: Set up Nextcloud env
Expand Down Expand Up @@ -211,5 +197,8 @@ jobs:
name: playwright-report
path: nextcloud/apps/twofactor_webauthn/playwright-report/
retention-days: 30
- name: Print server logs
if: always()
run: cat nextcloud/data/nextcloud.log*
env:
CI: true
7 changes: 4 additions & 3 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
<name>Two-Factor WebAuthn</name>
<summary>WebAuthn two-factor provider</summary>
<description>A two-factor provider for WebAuthn devices</description>
<version>1.5.0-alpha.1</version>
<version>2.0.0-alpha.1</version>
<licence>agpl</licence>
<author>Christoph Wurst</author>
<author>Michael Blumenstein</author>
<author>Richard Steinmetz</author>
<namespace>TwoFactorWebauthn</namespace>
<category>security</category>

Expand All @@ -18,9 +19,9 @@
<screenshot>https://raw.githubusercontent.com/nextcloud/twofactor_webauthn/main/screenshots/challenge.png</screenshot>

<dependencies>
<php min-version="8.0" max-version="8.3"/>
<php min-version="8.1" max-version="8.3"/>
<lib>gmp</lib>
<nextcloud min-version="27" max-version="30" />
<nextcloud min-version="30" max-version="30" />
</dependencies>

<repair-steps>
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
}
],
"require": {
"php": ">=8.0.0",
"php": ">=8.1.0",
"ext-json": "*",
"bamarni/composer-bin-plugin": "^1.8.2",
"web-auth/webauthn-lib": "^3.3.12"
"web-auth/webauthn-lib": "^4.8.5"
},
"require-dev": {
"christophwurst/nextcloud_testing": "^1.0.0",
Expand Down Expand Up @@ -45,7 +45,7 @@
"optimize-autoloader": true,
"classmap-authoritative": true,
"platform": {
"php": "8.0.0"
"php": "8.1.0"
},
"sort-packages": true,
"allow-plugins": {
Expand Down
Loading
Loading