From 8722333737b862270bbe92afcb75920ab4f3f349 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 28 Mar 2024 11:20:20 +0100
Subject: [PATCH] fix(CI)!: Add stable29 to and remove stable26 from GitHub
 Actions

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .github/dependabot.yml                      | 48 ++++++++++-----------
 .github/workflows/npm-audit-fix.yml         |  2 +-
 .github/workflows/update-cacert-bundle.yml  |  2 +-
 .github/workflows/update-psalm-baseline.yml |  2 +-
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 6023a59cc88..46b990e452b 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -100,26 +100,6 @@ updates:
 
 
 # Main stableXX npm
-- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable26
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-  ignore:
-    # ignore all GitHub linguist patch updates
-    - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
-  # Disable automatic rebasing because without a build CI will likely fail anyway
-  rebase-strategy: "disabled"
-
 - package-ecosystem: npm
   directory: "/"
   schedule:
@@ -160,15 +140,14 @@ updates:
   # Disable automatic rebasing because without a build CI will likely fail anyway
   rebase-strategy: "disabled"
 
-# Testing StableXX composer
-- package-ecosystem: composer
-  directory: "/build/integration"
+- package-ecosystem: npm
+  directory: "/"
   schedule:
     interval: weekly
     day: saturday
     time: "03:00"
     timezone: Europe/Paris
-  target-branch: stable26
+  target-branch: stable29
   labels:
     - "3. to review"
     - "feature: dependencies"
@@ -178,7 +157,10 @@ updates:
     # ignore all GitHub linguist patch updates
     - dependency-name: "*"
       update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
+  # Disable automatic rebasing because without a build CI will likely fail anyway
+  rebase-strategy: "disabled"
 
+  # Testing StableXX composer
 - package-ecosystem: composer
   directory: "/build/integration"
   schedule:
@@ -215,6 +197,24 @@ updates:
     - dependency-name: "*"
       update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
 
+- package-ecosystem: composer
+  directory: "/build/integration"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:00"
+    timezone: Europe/Paris
+  target-branch: stable29
+  labels:
+    - "3. to review"
+    - "feature: dependencies"
+  reviewers:
+    - "nextcloud/server-dependabot"
+  ignore:
+    # ignore all GitHub linguist patch updates
+    - dependency-name: "*"
+      update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
+
 # GitHub Actions
 - package-ecosystem: "github-actions"
   directory: "/"
diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml
index 687c47d3dfa..2fe41891648 100644
--- a/.github/workflows/npm-audit-fix.yml
+++ b/.github/workflows/npm-audit-fix.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branches: ["main", "master", "stable28", "stable27", "stable26"]
+        branches: ["main", "master", "stable29", "stable28", "stable27"]
 
     name: npm-audit-fix-${{ matrix.branches }}
 
diff --git a/.github/workflows/update-cacert-bundle.yml b/.github/workflows/update-cacert-bundle.yml
index 6fcd50c9585..8a37b19e5bd 100644
--- a/.github/workflows/update-cacert-bundle.yml
+++ b/.github/workflows/update-cacert-bundle.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branches: ["master", "stable28",  "stable27", "stable26", "stable25", "stable24", "stable23", "stable22"]
+        branches: ["master", "stable29",  "stable28",  "stable27", "stable26", "stable25", "stable24", "stable23", "stable22"]
 
     name: update-ca-certificate-bundle-${{ matrix.branches }}
 
diff --git a/.github/workflows/update-psalm-baseline.yml b/.github/workflows/update-psalm-baseline.yml
index a00668dff9a..4f60bf977d9 100644
--- a/.github/workflows/update-psalm-baseline.yml
+++ b/.github/workflows/update-psalm-baseline.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branches: ["master", "stable28", "stable27", "stable26"]
+        branches: ["master", "stable29", "stable28", "stable27"]
 
     name: update-psalm-baseline-${{ matrix.branches }}