Skip to content

Commit

Permalink
Merge pull request #222 from nextcloud/automated/noid/main-update-nex…
Browse files Browse the repository at this point in the history
…tcloud-ocp

[main] Update nextcloud/ocp dependency
  • Loading branch information
github-actions[bot] authored Dec 9, 2024
2 parents a10cf64 + f874b9a commit 9492b5a
Show file tree
Hide file tree
Showing 7 changed files with 2,744 additions and 991 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/psalm-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ jobs:
- name: Checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

- name: Set up php${{ matrix.php-versions }}
- name: Set up php8.3
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
with:
php-version: ${{ matrix.php-versions }}
php-version: 8.3
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
coverage: none
ini-file: development
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-nextcloud-ocp-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
fail-fast: false
matrix:
branches: ['main']
target: ['stable28']
target: ['stable29']

name: update-nextcloud-ocp-${{ matrix.branches }}

Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Changelog
All notable changes to this project will be documented in this file.

## 1.21.0 – 202Y-MM-DD
### Changed
- Require Nextcloud 29

## 1.20.0 – 2024-08-26
### Changed
- Nextcloud 30 compatibility
Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ It is also possible to have a link in the email and the notification for upsell
<screenshot>https://raw.githubusercontent.com/nextcloud/quota_warning/main/docs/email.png</screenshot>
<screenshot>https://raw.githubusercontent.com/nextcloud/quota_warning/main/docs/admin-settings.png</screenshot>
<dependencies>
<nextcloud min-version="28" max-version="31" />
<nextcloud min-version="29" max-version="31" />
</dependencies>
<repair-steps>
<install>
Expand Down
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@
"lint": "find . -name \\*.php -not -path './vendor/*' -not -path './build/*' -print0 | xargs -0 -n1 php -l",
"cs:check": "php-cs-fixer fix --dry-run --diff",
"cs:fix": "php-cs-fixer fix",
"psalm": "psalm.phar --threads=1",
"psalm:dev": "psalm.phar --no-cache --threads=$(nproc)",
"psalm:update-baseline": "psalm.phar --threads=1 --update-baseline --set-baseline=tests/psalm-baseline.xml",
"psalm:clear": "psalm.phar --clear-cache && psalm.phar --clear-global-cache",
"psalm:fix": "psalm.phar --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType",
"psalm": "psalm --threads=1",
"psalm:dev": "psalm --no-cache --threads=$(nproc)",
"psalm:update-baseline": "psalm --threads=1 --update-baseline --set-baseline=tests/psalm-baseline.xml",
"psalm:clear": "psalm --clear-cache && psalm --clear-global-cache",
"psalm:fix": "psalm --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType",
"test:unit": "vendor/bin/phpunit --color -c tests/phpunit.xml"
},
"require-dev": {
"nextcloud/coding-standard": "^1.2",
"nextcloud/ocp": "dev-stable28",
"nextcloud/coding-standard": "^1.3",
"nextcloud/ocp": "dev-stable29",
"phpunit/phpunit": "^9.6",
"psalm/phar": "^5.25"
"vimeo/psalm": "^5.26"
}
}
Loading

0 comments on commit 9492b5a

Please sign in to comment.