Skip to content

Commit dde6681

Browse files
nickvergessennickvergessen
authored
Merge pull request nextcloud#57684 from nextcloud/master-is-now-34
Master is now 34
2 parents a251294 + ce8a97b commit dde6681

File tree

41 files changed

+137
-80
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+137
-80
lines changed

‎.github/ISSUE_TEMPLATE/BUG_REPORT.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,8 @@ body:
7171
Select Nextcloud Server version.
7272
_Versions not listed here are not maintained and not supported anymore_
7373
options:
74-
- "30"
75-
- "31"
7674
- "32"
75+
- "33"
7776
- "master"
7877
validations:
7978
required: true
@@ -96,6 +95,7 @@ body:
9695
Select PHP engine version serving Nextcloud Server.
9796
_Describe in the "Additional info" section if you chose "Other"._
9897
options:
98+
- "PHP 8.5"
9999
- "PHP 8.4"
100100
- "PHP 8.3"
101101
- "PHP 8.2"

‎.github/dependabot.yml‎

Lines changed: 61 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ updates:
2121
- package-ecosystem: composer
2222
directories:
2323
- "/"
24-
- "/build/integration"
24+
- "/vendor-bin/behat"
2525
- "/vendor-bin/cs-fixer"
2626
- "/vendor-bin/openapi-extractor"
2727
- "/vendor-bin/phpunit"
@@ -64,16 +64,18 @@ updates:
6464
- "@vitest/*"
6565

6666
# Latest stable release
67+
6768
# Composer dependencies for linting and testing
6869
- package-ecosystem: composer
69-
target-branch: stable32
70+
target-branch: stable33
7071
directories:
7172
- "/"
7273
- "/vendor-bin/behat"
7374
- "/vendor-bin/cs-fixer"
7475
- "/vendor-bin/openapi-extractor"
7576
- "/vendor-bin/phpunit"
7677
- "/vendor-bin/psalm"
78+
- "/vendor-bin/rector"
7779
schedule:
7880
interval: weekly
7981
day: saturday
@@ -87,11 +89,13 @@ updates:
8789
- dependency-name: "*"
8890
update-types: ["version-update:semver-major", "version-update:semver-minor"]
8991

90-
# Latest stable branch
9192
# frontend dependencies
9293
- package-ecosystem: npm
93-
target-branch: stable32
94-
directory: "/"
94+
target-branch: stable33
95+
directories:
96+
- "/"
97+
- "/build/frontend"
98+
- "/build/frontend-legacy"
9599
schedule:
96100
interval: weekly
97101
day: saturday
@@ -103,13 +107,65 @@ updates:
103107
- "feature: dependencies"
104108
# Disable automatic rebasing because without a build CI will likely fail anyway
105109
rebase-strategy: "disabled"
110+
groups:
111+
vite:
112+
patterns:
113+
- "vite"
114+
- "@nextcloud/vite-config"
115+
vitest:
116+
patterns:
117+
- "vitest"
118+
- "@vitest/*"
106119
ignore:
107120
# no major updates on stable branches
108121
- dependency-name: "*"
109122
update-types: ["version-update:semver-major"]
110123

111124
# Older stable releases
112125

126+
# Composer dependencies for linting and testing
127+
- package-ecosystem: composer
128+
target-branch: stable32
129+
directories:
130+
- "/"
131+
- "/vendor-bin/behat"
132+
- "/vendor-bin/cs-fixer"
133+
- "/vendor-bin/openapi-extractor"
134+
- "/vendor-bin/phpunit"
135+
- "/vendor-bin/psalm"
136+
schedule:
137+
interval: weekly
138+
day: saturday
139+
time: "04:30"
140+
timezone: Europe/Paris
141+
labels:
142+
- "3. to review"
143+
- "feature: dependencies"
144+
ignore:
145+
# only patch updates on stable branches
146+
- dependency-name: "*"
147+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
148+
149+
# frontend dependencies
150+
- package-ecosystem: npm
151+
target-branch: stable32
152+
directory: "/"
153+
schedule:
154+
interval: weekly
155+
day: saturday
156+
time: "04:30"
157+
timezone: Europe/Paris
158+
open-pull-requests-limit: 20
159+
labels:
160+
- "3. to review"
161+
- "feature: dependencies"
162+
# Disable automatic rebasing because without a build CI will likely fail anyway
163+
rebase-strategy: "disabled"
164+
ignore:
165+
# no major updates on stable branches
166+
- dependency-name: "*"
167+
update-types: ["version-update:semver-major"]
168+
113169
# Composer dependencies for linting and testing
114170
- package-ecosystem: composer
115171
target-branch: stable31

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
matrix:
2727
branches:
2828
- ${{ github.event.repository.default_branch }}
29+
- 'stable33'
2930
- 'stable32'
3031
- 'stable31'
3132

‎.github/workflows/update-cacert-bundle.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: ['master', 'stable32', 'stable31', 'stable30', 'stable29', 'stable28', 'stable27', 'stable26', 'stable25', 'stable24', 'stable23', 'stable22']
20+
branches: ['master', 'stable33', 'stable32', 'stable31', 'stable30', 'stable29', 'stable28', 'stable27', 'stable26', 'stable25', 'stable24', 'stable23', 'stable22']
2121

2222
name: update-ca-certificate-bundle-${{ matrix.branches }}
2323

‎.github/workflows/update-code-signing-crl.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: ['master', 'stable32', 'stable31', 'stable30', 'stable29', 'stable28', 'stable27', 'stable26', 'stable25', 'stable24', 'stable23', 'stable22']
20+
branches: ['master', 'stable33', 'stable32', 'stable31', 'stable30', 'stable29', 'stable28', 'stable27', 'stable26', 'stable25', 'stable24', 'stable23', 'stable22']
2121

2222
name: update-code-signing-crl-${{ matrix.branches }}
2323

‎3rdparty‎

‎apps/admin_audit/appinfo/info.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<name>Auditing / Logging</name>
1111
<summary>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</summary>
1212
<description>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</description>
13-
<version>1.23.0</version>
13+
<version>1.24.0</version>
1414
<licence>agpl</licence>
1515
<author>Nextcloud</author>
1616
<namespace>AdminAudit</namespace>
@@ -20,7 +20,7 @@
2020
<category>monitoring</category>
2121
<bugs>https://github.com/nextcloud/server/issues</bugs>
2222
<dependencies>
23-
<nextcloud min-version="33" max-version="33"/>
23+
<nextcloud min-version="34" max-version="34"/>
2424
</dependencies>
2525
<background-jobs>
2626
<job>OCA\AdminAudit\BackgroundJobs\Rotate</job>

‎apps/cloud_federation_api/appinfo/info.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<name>Cloud Federation API</name>
1010
<summary>Enable clouds to communicate with each other and exchange data</summary>
1111
<description>The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data.</description>
12-
<version>1.17.0</version>
12+
<version>1.18.0</version>
1313
<licence>agpl</licence>
1414
<author>Bjoern Schiessle</author>
1515
<namespace>CloudFederationAPI</namespace>
@@ -19,6 +19,6 @@
1919
<category>integration</category>
2020
<bugs>https://github.com/nextcloud/server/issues</bugs>
2121
<dependencies>
22-
<nextcloud min-version="33" max-version="33"/>
22+
<nextcloud min-version="34" max-version="34"/>
2323
</dependencies>
2424
</info>

‎apps/comments/appinfo/info.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<name>Comments</name>
1111
<summary>Files app plugin to add comments to files</summary>
1212
<description>Files app plugin to add comments to files</description>
13-
<version>1.23.0</version>
13+
<version>1.24.0</version>
1414
<licence>agpl</licence>
1515
<author>Arthur Schiwon</author>
1616
<author>Vincent Petry</author>
@@ -21,7 +21,7 @@
2121
<category>social</category>
2222
<bugs>https://github.com/nextcloud/server/issues</bugs>
2323
<dependencies>
24-
<nextcloud min-version="33" max-version="33"/>
24+
<nextcloud min-version="34" max-version="34"/>
2525
</dependencies>
2626

2727
<activity>

‎apps/contactsinteraction/appinfo/info.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<name>Contacts Interaction</name>
1010
<summary>Manages interaction between accounts and contacts</summary>
1111
<description>Collect data about accounts and contacts interactions and provide an address book for the data</description>
12-
<version>1.14.1</version>
12+
<version>1.15.0</version>
1313
<licence>agpl</licence>
1414
<author>Christoph Wurst</author>
1515
<author homepage="https://github.com/nextcloud/groupware">Nextcloud Groupware Team</author>
@@ -21,7 +21,7 @@
2121
<category>social</category>
2222
<bugs>https://github.com/nextcloud/server/issues</bugs>
2323
<dependencies>
24-
<nextcloud min-version="33" max-version="33"/>
24+
<nextcloud min-version="34" max-version="34"/>
2525
</dependencies>
2626
<background-jobs>
2727
<job>OCA\ContactsInteraction\BackgroundJob\CleanupJob</job>

0 commit comments

Comments
 (0)