Merge pull request #60391 from nextcloud/chore/master-is-now-35

🚀 Master is now 35

Author: nickvergessen

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -73,7 +73,8 @@ body:
       options:
         - "32"
         - "33"
-        - "34 (master)"
+        - "34"
+        - "35 (master)"
     validations:
       required: true
   - type: dropdown

.github/dependabot.yml

@@ -74,7 +74,7 @@ updates:
 
 # Composer dependencies for linting and testing
 - package-ecosystem: composer
-  target-branch: stable33
+  target-branch: stable34
   directories:
     - "/"
     - "/vendor-bin/behat"
@@ -98,7 +98,7 @@ updates:
 
 # frontend dependencies
 - package-ecosystem: npm
-  target-branch: stable33
+  target-branch: stable34
   directories:
     - "/"
     - "/build/frontend"
@@ -133,6 +133,52 @@ updates:
 
 # Older stable releases
 
+# Composer dependencies for linting and testing
+- package-ecosystem: composer
+  target-branch: stable33
+  directories:
+    - "/"
+    - "/vendor-bin/behat"
+    - "/vendor-bin/cs-fixer"
+    - "/vendor-bin/openapi-extractor"
+    - "/vendor-bin/phpunit"
+    - "/vendor-bin/psalm"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "04:30"
+    timezone: Europe/Paris
+  labels:
+    - "3. to review"
+    - "feature: dependencies"
+  ignore:
+    # only patch updates on stable branches
+    - dependency-name: "*"
+      update-types: ["version-update:semver-major", "version-update:semver-minor"]
+
+# frontend dependencies
+- package-ecosystem: npm
+  target-branch: stable33
+  directory: "/"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "04:30"
+    timezone: Europe/Paris
+  cooldown:
+    default-days: 4
+    semver-major-days: 8
+  open-pull-requests-limit: 20
+  labels:
+    - "3. to review"
+    - "feature: dependencies"
+  # Disable automatic rebasing because without a build CI will likely fail anyway
+  rebase-strategy: "disabled"
+  ignore:
+    # no major updates on stable branches
+    - dependency-name: "*"
+      update-types: ["version-update:semver-major"]
+
 # Composer dependencies for linting and testing
 - package-ecosystem: composer
   target-branch: stable32

.github/workflows/update-cacert-bundle.yml

@@ -17,7 +17,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branches: ['master', 'stable33', 'stable32', 'stable31', 'stable30', 'stable29',  'stable28',  'stable27', 'stable26', 'stable25', 'stable24', 'stable23', 'stable22']
+        branches:
+          - ${{ github.event.repository.default_branch }}
+          - 'stable34'
+          - 'stable33'
+          - 'stable32'
+          - 'stable31'
+          - 'stable30'
+          - 'stable29'
+          - 'stable28'
+          - 'stable27'
+          - 'stable26'
+          - 'stable25'
+          - 'stable24'
+          - 'stable23'
+          - 'stable22'
 
     name: update-ca-certificate-bundle-${{ matrix.branches }}
 

.github/workflows/update-code-signing-crl.yml

@@ -17,7 +17,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branches: ['master', 'stable33', 'stable32', 'stable31', 'stable30', 'stable29',  'stable28',  'stable27', 'stable26', 'stable25', 'stable24', 'stable23', 'stable22']
+        branches:
+          - ${{ github.event.repository.default_branch }}
+          - 'stable34'
+          - 'stable33'
+          - 'stable32'
+          - 'stable31'
+          - 'stable30'
+          - 'stable29'
+          - 'stable28'
+          - 'stable27'
+          - 'stable26'
+          - 'stable25'
+          - 'stable24'
+          - 'stable23'
+          - 'stable22'
 
     name: update-code-signing-crl-${{ matrix.branches }}
 

3rdparty

@@ -10,7 +10,7 @@
 	<name>Auditing / Logging</name>
 	<summary>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</summary>
 	<description>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</description>
-	<version>1.24.0</version>
+	<version>2.0.0-dev.0</version>
 	<licence>agpl</licence>
 	<author>Nextcloud</author>
 	<namespace>AdminAudit</namespace>
@@ -20,7 +20,7 @@
 	<category>monitoring</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="34" max-version="34"/>
+		<nextcloud min-version="35" max-version="35"/>
 	</dependencies>
 	<background-jobs>
 		<job>OCA\AdminAudit\BackgroundJobs\Rotate</job>

apps/admin_audit/appinfo/info.xml

@@ -9,14 +9,14 @@
 	<name>Nextcloud Appstore</name>
 	<summary>Nextcloud Appstore</summary>
 	<description>Nextcloud Appstore</description>
-	<version>1.0.0</version>
+	<version>2.0.0-dev.0</version>
 	<licence>agpl</licence>
 	<author>Nextcloud</author>
 	<namespace>Appstore</namespace>
 
 	<category>customization</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="34" max-version="34"/>
+		<nextcloud min-version="35" max-version="35"/>
 	</dependencies>
 </info>

apps/appstore/appinfo/info.xml

@@ -9,7 +9,7 @@
 	<name>Cloud Federation API</name>
 	<summary>Enable clouds to communicate with each other and exchange data</summary>
 	<description>The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data.</description>
-	<version>1.18.0</version>
+	<version>2.0.0-dev.0</version>
 	<licence>agpl</licence>
 	<author>Bjoern Schiessle</author>
 	<namespace>CloudFederationAPI</namespace>
@@ -19,6 +19,6 @@
 	<category>integration</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="34" max-version="34"/>
+		<nextcloud min-version="35" max-version="35"/>
 	</dependencies>
 </info>

apps/cloud_federation_api/appinfo/info.xml

@@ -10,7 +10,7 @@
 	<name>Comments</name>
 	<summary>Files app plugin to add comments to files</summary>
 	<description>Files app plugin to add comments to files</description>
-	<version>1.24.0</version>
+	<version>2.0.0-dev.0</version>
 	<licence>agpl</licence>
 	<author>Arthur Schiwon</author>
 	<author>Vincent Petry</author>
@@ -21,7 +21,7 @@
 	<category>social</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="34" max-version="34"/>
+		<nextcloud min-version="35" max-version="35"/>
 	</dependencies>
 
 	<activity>

apps/comments/appinfo/info.xml

@@ -9,7 +9,7 @@
 	<name>Contacts Interaction</name>
 	<summary>Manages interaction between accounts and contacts</summary>
 	<description>Collect data about accounts and contacts interactions and provide an address book for the data</description>
-	<version>1.15.0</version>
+	<version>2.0.0-dev.0</version>
 	<licence>agpl</licence>
 	<author>Christoph Wurst</author>
 	<author homepage="https://github.com/nextcloud/groupware">Nextcloud Groupware Team</author>
@@ -21,7 +21,7 @@
 	<category>social</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="34" max-version="34"/>
+		<nextcloud min-version="35" max-version="35"/>
 	</dependencies>
 	<background-jobs>
 		<job>OCA\ContactsInteraction\BackgroundJob\CleanupJob</job>