Skip to content

Commit

Permalink
Merge pull request #994 from nextcloud/update-master-version
Browse files Browse the repository at this point in the history
feat(deps): Add Nextcloud 29 support on master
  • Loading branch information
Pytal authored Nov 23, 2023
2 parents 91f8e26 + fbd90cd commit 7f6e0c5
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 10 deletions.
7 changes: 4 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ updates:
day: saturday
time: "03:00"
timezone: Europe/Paris
target-branch: stable27
target-branch: stable28
labels:
- "3. to review"
- "dependencies"
Expand All @@ -46,7 +46,7 @@ updates:
day: saturday
time: "03:00"
timezone: Europe/Paris
target-branch: stable26
target-branch: stable27
labels:
- "3. to review"
- "dependencies"
Expand All @@ -62,11 +62,12 @@ updates:
day: saturday
time: "03:00"
timezone: Europe/Paris
target-branch: stable25
target-branch: stable26
labels:
- "3. to review"
- "dependencies"
ignore:
# ignore all GitHub linguist patch updates
- dependency-name: "*"
update-types: ["version-update:semver-major", "version-update:semver-minor"]

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: ["master", "stable27", "stable26", "stable25"]
branches: ["master", "stable28", "stable27", "stable26"]

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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/phpunit-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

strategy:
matrix:
php-versions: ['8.0', '8.1', '8.2']
php-versions: ['8.0', '8.1', '8.2', '8.3']
server-versions: ['master']

services:
Expand Down
4 changes: 2 additions & 2 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<name>Privacy</name>
<summary>-</summary>
<description><![CDATA[The privacy center shows you where your data is stored and who can access it, either because you shared with them or because they are administrators.]]></description>
<version>1.12.0</version>
<version>1.13.0</version>
<licence>agpl</licence>
<author mail="georg.ehrke@nextcloud.com">Georg Ehrke</author>
<namespace>Privacy</namespace>
<category>tools</category>
<bugs>https://github.com/nextcloud/privacy/issues/</bugs>
<dependencies>
<nextcloud min-version="28" max-version="28" />
<nextcloud min-version="29" max-version="29" />
</dependencies>
<default_enable />
<settings>
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "privacy",
"version": "1.12.0",
"version": "1.13.0",
"description": "Place this app in **nextcloud/apps/**",
"private": true,
"scripts": {
Expand Down

0 comments on commit 7f6e0c5

Please sign in to comment.