From 8126ef676341b1e4741dadb38b20b82e6cc22291 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 14 Aug 2024 12:49:09 +0200 Subject: [PATCH] feat(deps): Add Nextcloud 31 support on master Signed-off-by: Joas Schilling --- .github/dependabot.yml | 18 ++++++++++++++++++ .github/workflows/npm-audit-fix.yml | 2 +- .github/workflows/update-nextcloud-ocp.yml | 2 +- appinfo/info.xml | 4 ++-- package-lock.json | 4 ++-- package.json | 2 +- 6 files changed, 25 insertions(+), 7 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ce78f6e8..7d6da33f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -24,6 +24,23 @@ updates: - "dependencies" # Main stableXX npm +- package-ecosystem: npm + directory: "/" + schedule: + interval: weekly + day: saturday + time: "03:00" + timezone: Europe/Paris + target-branch: stable30 + versioning-strategy: increase + labels: + - "3. to review" + - "dependencies" + ignore: + # ignore all GitHub linguist patch updates + - dependency-name: "*" + update-types: ["version-update:semver-major", "version-update:semver-minor"] + - package-ecosystem: npm directory: "/" schedule: @@ -57,3 +74,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 0e7ba4b5..a45455b7 100644 --- a/.github/workflows/npm-audit-fix.yml +++ b/.github/workflows/npm-audit-fix.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - branches: ['main', 'master', 'stable29', 'stable28', 'stable27'] + branches: ['main', 'master', 'stable30', 'stable29', 'stable28'] name: npm-audit-fix-${{ matrix.branches }} diff --git a/.github/workflows/update-nextcloud-ocp.yml b/.github/workflows/update-nextcloud-ocp.yml index ae3f0203..c3f0df17 100644 --- a/.github/workflows/update-nextcloud-ocp.yml +++ b/.github/workflows/update-nextcloud-ocp.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - branches: ['main', 'master', 'stable29', 'stable28', 'stable27'] + branches: ['main', 'master', 'stable30', 'stable29', 'stable28'] name: update-nextcloud-ocp-${{ matrix.branches }} diff --git a/appinfo/info.xml b/appinfo/info.xml index b628a941..6e19e152 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -9,7 +9,7 @@ Provides the necessary endpoint to enable end-to-end encryption. **Notice:** E2EE is currently not compatible to be used together with server-side encryption ]]> - 1.16.0-beta.1 + 2.0.0-dev.0 agpl Bjoern Schiessle EndToEndEncryption @@ -23,7 +23,7 @@ Provides the necessary endpoint to enable end-to-end encryption. https://github.com/nextcloud/end_to_end_encryption.git https://raw.githubusercontent.com/nextcloud/end_to_end_encryption/master/screenshots/e2ee-filelisting.png - + OCA\EndToEndEncryption\BackgroundJob\RollbackBackgroundJob diff --git a/package-lock.json b/package-lock.json index de28133f..3201cf3f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "end_to_end_encryption", - "version": "1.16.0", + "version": "2.0.0-dev.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "end_to_end_encryption", - "version": "1.16.0", + "version": "2.0.0-dev.0", "license": "AGPL-3.0-or-later", "dependencies": { "@nextcloud/auth": "^2.3.0", diff --git a/package.json b/package.json index f54285d2..1f8f6725 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "end_to_end_encryption", - "version": "1.16.0", + "version": "2.0.0-dev.0", "description": "Provides the necessary endpoint to enable End-to-End encryption.", "author": "Nextcloud GmbH and Nextcloud contributors", "license": "AGPL-3.0-or-later",