diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml index 3c58f642953..df26e1ee47b 100644 --- a/.github/workflows/npm-audit-fix.yml +++ b/.github/workflows/npm-audit-fix.yml @@ -24,7 +24,7 @@ jobs: strategy: fail-fast: false matrix: - branches: ['main', 'master', 'stable31', 'stable30', 'stable29'] + branches: ['main', 'master', 'stable31', 'stable30'] name: npm-audit-fix-${{ matrix.branches }} diff --git a/.github/workflows/update-nextcloud-ocp.yml b/.github/workflows/update-nextcloud-ocp.yml index 4ac00be0b0d..c8588505345 100644 --- a/.github/workflows/update-nextcloud-ocp.yml +++ b/.github/workflows/update-nextcloud-ocp.yml @@ -23,7 +23,7 @@ jobs: strategy: fail-fast: false matrix: - branches: ['main', 'master', 'stable31', 'stable30', 'stable29'] + branches: ['main', 'master', 'stable31', 'stable30'] name: update-nextcloud-ocp-${{ matrix.branches }} diff --git a/renovate.json b/renovate.json index 42a631cbb21..067a5cac222 100644 --- a/renovate.json +++ b/renovate.json @@ -20,8 +20,7 @@ "baseBranches": [ "main", "stable31", - "stable30", - "stable29" + "stable30" ], "enabledManagers": [ "npm" @@ -110,6 +109,7 @@ "minor" ], "matchBaseBranches": [ + "stable29", "stable28", "stable27", "stable26"