From 725d33c48d1081b43f84136dd66f60dcbbd9d38d Mon Sep 17 00:00:00 2001 From: Richard Steinmetz Date: Wed, 15 Nov 2023 19:38:54 +0100 Subject: [PATCH] fix: drop support for nextcloud 25 and php 7.4 Signed-off-by: Richard Steinmetz --- .github/workflows/npm-audit-fix.yml | 4 ++-- .github/workflows/psalm-matrix.yml | 2 +- .github/workflows/test.yml | 9 ++------- appinfo/info.xml | 4 ++-- composer.json | 4 ++-- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml index 9d3da234..6595d8ca 100644 --- a/.github/workflows/npm-audit-fix.yml +++ b/.github/workflows/npm-audit-fix.yml @@ -18,8 +18,8 @@ jobs: strategy: fail-fast: false matrix: - branches: ["main", "stable1.2"] - + branches: ["main", "stable1.3"] + name: npm-audit-fix-${{ matrix.branches }} steps: diff --git a/.github/workflows/psalm-matrix.yml b/.github/workflows/psalm-matrix.yml index ea5e8c64..26acc8a8 100644 --- a/.github/workflows/psalm-matrix.yml +++ b/.github/workflows/psalm-matrix.yml @@ -18,7 +18,7 @@ jobs: # do not stop on another job's failure fail-fast: false matrix: - ocp-version: [ 'dev-master', 'dev-stable27', 'dev-stable26', 'dev-stable25' ] + ocp-version: [ 'dev-master', 'dev-stable27', 'dev-stable26' ] name: Nextcloud ${{ matrix.ocp-version }} steps: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index af29ae86..52314b19 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,12 +15,10 @@ jobs: php-version: ['8.0', '8.1', '8.2'] nextcloud-version: ['master', 'stable27', 'stable26'] include: - - php-version: '7.4' - nextcloud-version: stable25 - php-version: '8.0' - nextcloud-version: stable25 + nextcloud-version: stable26 - php-version: '8.1' - nextcloud-version: stable25 + nextcloud-version: stable26 name: Nextcloud ${{ matrix.nextcloud-version }} php${{ matrix.php-version }} unit tests steps: - name: Set up Nextcloud env @@ -62,9 +60,6 @@ jobs: - php-version: '8.2' nextcloud-version: master db: 'mysql' - - php-version: '7.4' - nextcloud-version: stable25 - db: 'mysql' name: php${{ matrix.php-version }}-${{ matrix.db }} integration tests services: mysql-service: diff --git a/appinfo/info.xml b/appinfo/info.xml index 9291ae5c..e30dfbf5 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -18,9 +18,9 @@ https://raw.githubusercontent.com/nextcloud/twofactor_webauthn/main/screenshots/challenge.png - + gmp - + diff --git a/composer.json b/composer.json index 3eb18962..578e20af 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ } ], "require": { - "php": ">=7.4.0", + "php": ">=8.0.0", "ext-json": "*", "bamarni/composer-bin-plugin": "^1.8.2", "web-auth/webauthn-lib": "^3.3.12" @@ -45,7 +45,7 @@ "optimize-autoloader": true, "classmap-authoritative": true, "platform": { - "php": "7.4.0" + "php": "8.0.0" }, "sort-packages": true, "allow-plugins": {