Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(deps): Add Nextcloud 31 support on master #721

Merged
merged 1 commit into from
Aug 15, 2024
Merged

feat(deps): Add Nextcloud 31 support on master #721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -57,3 +74,4 @@ updates:
# 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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-nextcloud-ocp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
4 changes: 2 additions & 2 deletions appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
]]></description>
<version>1.16.0-beta.1</version>
<version>2.0.0-dev.0</version>
<licence>agpl</licence>
<author>Bjoern Schiessle</author>
<namespace>EndToEndEncryption</namespace>
Expand All @@ -23,7 +23,7 @@ Provides the necessary endpoint to enable end-to-end encryption.
<repository type="git">https://github.com/nextcloud/end_to_end_encryption.git</repository>
<screenshot>https://raw.githubusercontent.com/nextcloud/end_to_end_encryption/master/screenshots/e2ee-filelisting.png</screenshot>
<dependencies>
<nextcloud min-version="30" max-version="30" />
<nextcloud min-version="31" max-version="31" />
</dependencies>
<background-jobs>
<job>OCA\EndToEndEncryption\BackgroundJob\RollbackBackgroundJob</job>
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Loading