Skip to content

Commit e6b26f6

Browse files
authored
Merge pull request #2147 from nextcloud/update-master-version
feat(deps): Add Nextcloud 29 support on master
2 parents 2b531dc + c541942 commit e6b26f6

File tree

7 files changed

+14
-13
lines changed

7 files changed

+14
-13
lines changed

.github/dependabot.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ updates:
3030
day: saturday
3131
time: "03:00"
3232
timezone: Europe/Paris
33-
target-branch: stable27
33+
target-branch: stable28
3434
labels:
3535
- "3. to review"
3636
- "dependencies"
@@ -46,7 +46,7 @@ updates:
4646
day: saturday
4747
time: "03:00"
4848
timezone: Europe/Paris
49-
target-branch: stable26
49+
target-branch: stable27
5050
labels:
5151
- "3. to review"
5252
- "dependencies"
@@ -62,11 +62,12 @@ updates:
6262
day: saturday
6363
time: "03:00"
6464
timezone: Europe/Paris
65-
target-branch: stable25
65+
target-branch: stable26
6666
labels:
6767
- "3. to review"
6868
- "dependencies"
6969
ignore:
7070
# ignore all GitHub linguist patch updates
7171
- dependency-name: "*"
7272
update-types: ["version-update:semver-major", "version-update:semver-minor"]
73+

.github/workflows/npm-audit-fix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
branches: ["main", "master", "stable27", "stable26", "stable25", "stable24"]
21+
branches: ["main", "master", "stable28", "stable27", "stable26", "stable25", "stable24"]
2222

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

.github/workflows/phpunit-mysql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
strategy:
4040
matrix:
41-
php-versions: ['8.0', '8.1', '8.2']
41+
php-versions: ['8.0', '8.1', '8.2', '8.3']
4242
server-versions: ['master']
4343

4444
services:
@@ -159,4 +159,4 @@ jobs:
159159

160160
steps:
161161
- name: Summary status
162-
run: if ${{ needs.phpunit-mysql.result != 'success' }}; then exit 1; fi
162+
run: if ${{ needs.phpunit-mysql.result != 'success' }}; then exit 1; fi

.github/workflows/update-nextcloud-ocp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
branches: ["main", "master", "stable27", "stable26", "stable25"]
20+
branches: ["main", "master", "stable28", "stable27", "stable26"]
2121

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

appinfo/info.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<name>Photos</name>
66
<summary>Your memories under your control</summary>
77
<description>Your memories under your control</description>
8-
<version>2.4.0</version>
8+
<version>2.5.0</version>
99
<licence>agpl</licence>
1010
<author mail="[email protected]">John Molakvoæ</author>
1111
<namespace>Photos</namespace>
@@ -20,7 +20,7 @@
2020
<repository>https://github.com/nextcloud/photos.git</repository>
2121
<default_enable />
2222
<dependencies>
23-
<nextcloud min-version="28" max-version="28" />
23+
<nextcloud min-version="29" max-version="29" />
2424
</dependencies>
2525
<navigations>
2626
<navigation>
@@ -47,4 +47,4 @@
4747
<background-jobs>
4848
<job>OCA\Photos\Jobs\AutomaticPlaceMapperJob</job>
4949
</background-jobs>
50-
</info>
50+
</info>

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "photos",
33
"description": "Your memories under your control",
4-
"version": "2.4.0",
4+
"version": "2.5.0",
55
"author": "John Molakvoæ <[email protected]>",
66
"contributors": [
77
"John Molakvoæ <[email protected]>"

0 commit comments

Comments
 (0)