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

Add support for PHP 8.3 and Nextcloud 29 #489

Merged
merged 2 commits into from
Nov 28, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/appstore-build-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
types: [published]

env:
PHP_VERSION: 8.1
PHP_VERSION: 8.2

jobs:
build_and_publish:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint-php-cs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Set up php
uses: shivammathur/setup-php@1a18b2267f80291a81ca1d33e7c851fe09e7dfc4 # v2
- name: Set up php8.1
uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2
with:
php-version: 8.1
coverage: none
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/npm-audit-fix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
branches: ["main", "stable1.3"]
branches: ['main', 'stable1.3']

name: npm-audit-fix-${{ matrix.branches }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/psalm-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' ]
ocp-version: [ 'dev-master', 'dev-stable28', 'dev-stable27', 'dev-stable26' ]

name: Nextcloud ${{ matrix.ocp-version }}
steps:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
php-version: ['8.0', '8.1', '8.2']
nextcloud-version: ['master', 'stable27', 'stable26']
include:
- php-version: '8.0'
nextcloud-version: stable26
- php-version: '8.1'
nextcloud-version: stable26
- php-version: '8.3'
nextcloud-version: stable28
- php-version: '8.3'
nextcloud-version: master
name: Nextcloud ${{ matrix.nextcloud-version }} php${{ matrix.php-version }} unit tests
steps:
- name: Set up Nextcloud env
Expand All @@ -44,7 +44,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-version: [ '8.1' ]
php-version: [ '8.3' ]
nextcloud-version: [ 'master' ]
db: [ 'sqlite' ]
include:
Expand All @@ -58,9 +58,9 @@ jobs:
nextcloud-version: stable27
db: 'pgsql'
- php-version: '8.2'
nextcloud-version: master
nextcloud-version: stable28
db: 'mysql'
name: php${{ matrix.php-version }}-${{ matrix.db }} integration tests
name: Nextcloud ${{ matrix.nextcloud-version }} php${{ matrix.php-version }}-${{ matrix.db }} integration tests
services:
mysql-service:
image: mariadb:10.5
Expand Down
4 changes: 2 additions & 2 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
<screenshot>https://raw.githubusercontent.com/nextcloud/twofactor_webauthn/main/screenshots/challenge.png</screenshot>

<dependencies>
<php min-version="8.0" max-version="8.2"/>
<php min-version="8.0" max-version="8.3"/>
<lib>gmp</lib>
<nextcloud min-version="26" max-version="28" />
<nextcloud min-version="26" max-version="29" />
</dependencies>

<repair-steps>
Expand Down
Loading