Skip to content

Commit

Permalink
Merge pull request #2147 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
artonge authored Nov 23, 2023
2 parents 2b531dc + c541942 commit e6b26f6
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 13 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: ["main", "master", "stable27", "stable26", "stable25", "stable24"]
branches: ["main", "master", "stable28", "stable27", "stable26", "stable25", "stable24"]

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

Expand Down
4 changes: 2 additions & 2 deletions .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 Expand Up @@ -159,4 +159,4 @@ jobs:

steps:
- name: Summary status
run: if ${{ needs.phpunit-mysql.result != 'success' }}; then exit 1; fi
run: if ${{ needs.phpunit-mysql.result != 'success' }}; then exit 1; fi
2 changes: 1 addition & 1 deletion .github/workflows/update-nextcloud-ocp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
branches: ["main", "master", "stable27", "stable26", "stable25"]
branches: ["main", "master", "stable28", "stable27", "stable26"]

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

Expand Down
6 changes: 3 additions & 3 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<name>Photos</name>
<summary>Your memories under your control</summary>
<description>Your memories under your control</description>
<version>2.4.0</version>
<version>2.5.0</version>
<licence>agpl</licence>
<author mail="skjnldsv@protonmail.com">John Molakvoæ</author>
<namespace>Photos</namespace>
Expand All @@ -20,7 +20,7 @@
<repository>https://github.com/nextcloud/photos.git</repository>
<default_enable />
<dependencies>
<nextcloud min-version="28" max-version="28" />
<nextcloud min-version="29" max-version="29" />
</dependencies>
<navigations>
<navigation>
Expand All @@ -47,4 +47,4 @@
<background-jobs>
<job>OCA\Photos\Jobs\AutomaticPlaceMapperJob</job>
</background-jobs>
</info>
</info>
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,7 +1,7 @@
{
"name": "photos",
"description": "Your memories under your control",
"version": "2.4.0",
"version": "2.5.0",
"author": "John Molakvoæ <skjnldsv@protonmail.com>",
"contributors": [
"John Molakvoæ <skjnldsv@protonmail.com>"
Expand Down

0 comments on commit e6b26f6

Please sign in to comment.