Merge pull request #63559 from nextcloud/chore/master-is-now-36

🚀 Master is now 36

Author: skjnldsv

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

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

.github/dependabot.yml

@@ -16,6 +16,8 @@ updates:
   labels:
     - "3. to review"
     - "feature: dependencies"
+  cooldown:
+    default-days: 7
 
 # Main composer (linting, testing, openapi)
 - package-ecosystem: composer
@@ -37,6 +39,8 @@ updates:
     - "feature: dependencies"
   open-pull-requests-limit: 20
   versioning-strategy: increase
+  cooldown:
+    default-days: 7
 
 # Main master npm frontend dependencies
 - package-ecosystem: npm
@@ -77,7 +81,7 @@ updates:
 
 # Composer dependencies for linting and testing
 - package-ecosystem: composer
-  target-branch: stable34
+  target-branch: stable35
   directories:
     - "/"
     - "/vendor-bin/behat"
@@ -91,6 +95,8 @@ updates:
     day: saturday
     time: "03:30"
     timezone: Europe/Paris
+  cooldown:
+    default-days: 7
   labels:
     - "3. to review"
     - "feature: dependencies"
@@ -101,7 +107,7 @@ updates:
 
 # frontend dependencies
 - package-ecosystem: npm
-  target-branch: stable34
+  target-branch: stable35
   directories:
     - "/"
     - "/build/frontend"
@@ -137,6 +143,58 @@ updates:
 
 # Older stable releases
 
+# Composer dependencies for linting and testing
+- package-ecosystem: composer
+  target-branch: stable34
+  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
+  cooldown:
+    default-days: 7
+  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: stable34
+  directories:
+    - "/"
+    - "/build/frontend"
+    - "/build/frontend-legacy"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "04:30"
+    timezone: Europe/Paris
+  cooldown:
+    default-days: 4
+    semver-major-days: 8
+  labels:
+    - "3. to review"
+    - "feature: dependencies"
+  open-pull-requests-limit: 20
+  versioning-strategy: increase
+  # 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: stable33
@@ -152,6 +210,8 @@ updates:
     day: saturday
     time: "04:30"
     timezone: Europe/Paris
+  cooldown:
+    default-days: 7
   labels:
     - "3. to review"
     - "feature: dependencies"
@@ -202,6 +262,8 @@ updates:
     day: saturday
     time: "04:30"
     timezone: Europe/Paris
+  cooldown:
+    default-days: 7
   labels:
     - "3. to review"
     - "feature: dependencies"

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

@@ -26,6 +26,7 @@ jobs:
       matrix:
         branches:
           - ${{ github.event.repository.default_branch }}
+          - 'stable35'
           - 'stable34'
           - 'stable33'
           - 'stable32'

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

@@ -19,6 +19,7 @@ jobs:
       matrix:
         branches:
           - ${{ github.event.repository.default_branch }}
+          - 'stable35'
           - 'stable34'
           - 'stable33'
           - 'stable32'

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

@@ -19,6 +19,7 @@ jobs:
       matrix:
         branches:
           - ${{ github.event.repository.default_branch }}
+          - 'stable35'
           - 'stable34'
           - 'stable33'
           - 'stable32'

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>2.0.0-dev.0</version>
+	<version>3.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="35" max-version="35"/>
+		<nextcloud min-version="36" max-version="36"/>
 	</dependencies>
 	<background-jobs>
 		<job>OCA\AdminAudit\BackgroundJobs\Rotate</job>

apps/admin_audit/appinfo/info.xml

@@ -9,15 +9,15 @@
 	<name>Nextcloud Appstore</name>
 	<summary>Nextcloud Appstore</summary>
 	<description>Nextcloud Appstore</description>
-	<version>2.0.0-dev.0</version>
+	<version>3.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="35" max-version="35"/>
+		<nextcloud min-version="36" max-version="36"/>
 	</dependencies>
 
 	<navigations>

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>2.0.0-dev.0</version>
+	<version>3.0.0-dev.0</version>
 	<licence>agpl</licence>
 	<author>Bjoern Schiessle</author>
 	<namespace>CloudFederationAPI</namespace>
@@ -19,7 +19,7 @@
 	<category>integration</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="35" max-version="35"/>
+		<nextcloud min-version="36" max-version="36"/>
 	</dependencies>
 
 	<background-jobs>

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>2.0.0-dev.0</version>
+	<version>3.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="35" max-version="35"/>
+		<nextcloud min-version="36" max-version="36"/>
 	</dependencies>
 
 	<activity>