From c54194263f95663a5d91b8e8be75f94955eca784 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 23 Nov 2023 14:25:21 +0100 Subject: [PATCH] feat(deps): Add Nextcloud 29 support on master Signed-off-by: Joas Schilling --- .github/dependabot.yml | 7 ++++--- .github/workflows/npm-audit-fix.yml | 2 +- .github/workflows/phpunit-mysql.yml | 4 ++-- .github/workflows/update-nextcloud-ocp.yml | 2 +- appinfo/info.xml | 6 +++--- package-lock.json | 4 ++-- package.json | 2 +- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index db7a0b4ee..b995c17cd 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -30,7 +30,7 @@ updates: day: saturday time: "03:00" timezone: Europe/Paris - target-branch: stable27 + target-branch: stable28 labels: - "3. to review" - "dependencies" @@ -46,7 +46,7 @@ updates: day: saturday time: "03:00" timezone: Europe/Paris - target-branch: stable26 + target-branch: stable27 labels: - "3. to review" - "dependencies" @@ -62,7 +62,7 @@ updates: day: saturday time: "03:00" timezone: Europe/Paris - target-branch: stable25 + target-branch: stable26 labels: - "3. to review" - "dependencies" @@ -70,3 +70,4 @@ updates: # ignore all GitHub linguist patch updates - dependency-name: "*" update-types: ["version-update:semver-major", "version-update:semver-minor"] + diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml index 5fa7f69e5..b4f1a0e84 100644 --- a/.github/workflows/npm-audit-fix.yml +++ b/.github/workflows/npm-audit-fix.yml @@ -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 }} diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml index 81387028a..ebfe5f457 100644 --- a/.github/workflows/phpunit-mysql.yml +++ b/.github/workflows/phpunit-mysql.yml @@ -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: @@ -159,4 +159,4 @@ jobs: steps: - name: Summary status - run: if ${{ needs.phpunit-mysql.result != 'success' }}; then exit 1; fi \ No newline at end of file + run: if ${{ needs.phpunit-mysql.result != 'success' }}; then exit 1; fi diff --git a/.github/workflows/update-nextcloud-ocp.yml b/.github/workflows/update-nextcloud-ocp.yml index e40744d3f..d9b9532e1 100644 --- a/.github/workflows/update-nextcloud-ocp.yml +++ b/.github/workflows/update-nextcloud-ocp.yml @@ -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 }} diff --git a/appinfo/info.xml b/appinfo/info.xml index 677c63729..e7cbf3b82 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -5,7 +5,7 @@ Photos Your memories under your control Your memories under your control - 2.4.0 + 2.5.0 agpl John Molakvoæ Photos @@ -20,7 +20,7 @@ https://github.com/nextcloud/photos.git - + @@ -47,4 +47,4 @@ OCA\Photos\Jobs\AutomaticPlaceMapperJob - \ No newline at end of file + diff --git a/package-lock.json b/package-lock.json index 397c1050b..ea9dff865 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "photos", - "version": "2.4.0", + "version": "2.5.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "photos", - "version": "2.4.0", + "version": "2.5.0", "license": "agpl", "dependencies": { "@essentials/request-timeout": "^1.3.0", diff --git a/package.json b/package.json index cfed971d0..90341f859 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "photos", "description": "Your memories under your control", - "version": "2.4.0", + "version": "2.5.0", "author": "John Molakvoæ ", "contributors": [ "John Molakvoæ "