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: lift min PHP version and NC #2687

Merged
merged 1 commit into from
Oct 14, 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
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"image": "ghcr.io/juliushaertl/nextcloud-dev-php81:latest",
"image": "ghcr.io/juliushaertl/nextcloud-dev-php82:latest",
"forwardPorts": [80],
"containerEnv": {
"NEXTCLOUD_AUTOINSTALL_APPS": "news",
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/api-integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ jobs:
- 5432:5432 # Maps tcp port 5432 on service container to the host
strategy:
matrix:
php-versions: ['8.0', '8.1']
nextcloud: ['stable27']
php-versions: ['8.2', '8.3']
nextcloud: ['stable29']
database: ['sqlite', 'pgsql', 'mysql']
experimental: [false]
include:
- php-versions: 8.1
- php-versions: 8.3
nextcloud: pre-release
database: sqlite
experimental: true
- php-versions: 8.2
- php-versions: 8.3
nextcloud: pre-release
database: sqlite
experimental: true
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/api-php-static-code-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ jobs:
continue-on-error: true
strategy:
matrix:
php-versions: ['8.0', '8.1', '8.2' ]
nextcloud: [ 'stable27' ]
php-versions: ['8.2', '8.3' ]
nextcloud: [ 'stable29' ]
database: [ 'sqlite' ]
include:
- php-versions: 8.2
- php-versions: 8.3
nextcloud: pre-release
database: sqlite
experimental: true
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/api-php-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ jobs:
name: "PHP: Nextcloud ${{ matrix.nextcloud }} - PHP ${{ matrix.php-versions }} - DB ${{ matrix.database }}"
strategy:
matrix:
php-versions: ['8.1']
nextcloud: ['stable27']
php-versions: ['8.3']
nextcloud: ['stable29']
database: ['sqlite']
experimental: [false]
codecoverage: [false]
include:
- php-versions: 8.2
nextcloud: stable27
- php-versions: 8.3
nextcloud: stable29
database: sqlite
experimental: false
codecoverage: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
name: "Release: build, sign and upload the app"
strategy:
matrix:
php-versions: ['8.1']
nextcloud: ['stable27']
php-versions: ['8.3']
nextcloud: ['stable29']
database: ['sqlite']
steps:
- name: Checkout
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/frontend-nodejs-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ jobs:
name: "Frontend: Nextcloud ${{ matrix.nextcloud }} - PHP ${{ matrix.php-versions }} - DB ${{ matrix.database }}"
strategy:
matrix:
php-versions: ['8.1']
nextcloud: ['stable27']
php-versions: ['8.3']
nextcloud: ['stable29']
database: ['sqlite']
experimental: [false]
steps:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/post-merge-tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ jobs:
name: "Coverage: Nextcloud ${{ matrix.nextcloud }} PHP ${{ matrix.php-version }}"
strategy:
matrix:
nextcloud: ['stable27']
php-version: ["8.3"]
nextcloud: ['stable29']
codecoverage: [true]
php-version: ["8.1"]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -41,11 +41,11 @@ jobs:

- name: Prep PHP tests
run: cd ../server/apps/news && make php-test-dependencies

- name: Unittests
run: cd ../server/apps/news && make unit-test
env:
CODECOVERAGE: ${{ matrix.codecoverage }}

- name: Upload codecoverage
run: cd ../server/apps/news && bash <(curl -s https://codecov.io/bash) -f build/php-unit.clover
6 changes: 3 additions & 3 deletions .github/workflows/updater-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
name: "Update Test: Nextcloud ${{ matrix.nextcloud }} - PHP ${{ matrix.php-versions }}"
strategy:
matrix:
php-versions: ['8.1']
nextcloud: ['stable27']
php-versions: ['8.3']
nextcloud: ['stable29']
database: ['sqlite']
experimental: [false]
steps:
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
sleep 2

cd ${{ github.workspace }}/../server

bats apps/news/tests/updater

# Kill php server
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ You can also check [on GitHub](https://github.com/nextcloud/news/releases), the
# Unreleased
## [25.x.x]
### Changed

- Require NC 29
- Require PHP 8.2 or higher

### Fixed

Expand Down
4 changes: 2 additions & 2 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Report a [feed issue](https://github.com/nextcloud/news/discussions/new)
<screenshot small-thumbnail="https://raw.githubusercontent.com/nextcloud/news/master/screenshots/2-small.png">https://raw.githubusercontent.com/nextcloud/news/master/screenshots/2.png</screenshot>
<screenshot small-thumbnail="https://raw.githubusercontent.com/nextcloud/news/master/screenshots/3-small.png">https://raw.githubusercontent.com/nextcloud/news/master/screenshots/3.png</screenshot>
<dependencies>
<php min-version="8.0" min-int-size="64"/>
<php min-version="8.2" min-int-size="64"/>
<database min-version="10">pgsql</database>
<database>sqlite</database>
<database min-version="8.0">mysql</database>
Expand All @@ -55,7 +55,7 @@ Report a [feed issue](https://github.com/nextcloud/news/discussions/new)
<lib>json</lib>

<owncloud max-version="0" min-version="0"/>
<nextcloud min-version="27" max-version="29"/>
<nextcloud min-version="29" max-version="30"/>
</dependencies>

<background-jobs>
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"source": "https://github.com/nextcloud/news/"
},
"require": {
"php": "~8.0",
"php": "^8.2",
"ezyang/htmlpurifier": "^4.17.0",
"pear/net_url2": "^2.2.2",
"riimu/kit-pathjoin": "^1.2.0",
Expand Down
Loading
Loading