fix: Renovate excluding minor vers. in PR for v2.x.x (#3703)

* Update renovate-config.js Signed-off-by: mirek163 <[email protected]> * Update renovate-config.js Co-authored-by: Elena Kubantseva <[email protected]> Signed-off-by: mirek163 <[email protected]> * Update renovate-config.js Co-authored-by: Elena Kubantseva <[email protected]> Signed-off-by: mirek163 <[email protected]> * Update renovate-config.js Co-authored-by: Elena Kubantseva <[email protected]> Signed-off-by: mirek163 <[email protected]> * Update renovate-config.js Co-authored-by: Elena Kubantseva <[email protected]> Signed-off-by: mirek163 <[email protected]> * Update renovate-config.js Co-authored-by: Elena Kubantseva <[email protected]> Signed-off-by: mirek163 <[email protected]> * Update renovate-config.js Co-authored-by: Elena Kubantseva <[email protected]> Signed-off-by: mirek163 <[email protected]> * Update renovate-config.js Signed-off-by: mirek163 <[email protected]> * Update renovate-config.js Co-authored-by: Elena Kubantseva <[email protected]> Signed-off-by: mirek163 <[email protected]> * Adding PAT Signed-off-by: mirek163 <[email protected]> --------- Signed-off-by: mirek163 <[email protected]> Co-authored-by: Elena Kubantseva <[email protected]>
zowe · Aug 28, 2024 · 78e91d9 · 78e91d9
1 parent 9e23fba
commit 78e91d9
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 7 deletions.
diff --git a/.github/workflows/renovate-bot.yml b/.github/workflows/renovate-bot.yml
@@ -20,7 +20,7 @@ jobs:
             - name: Run Renovate
               env:
                   # RENOVATE_TOKEN should have access :read_user, api, write_repository (repo checkbox)
-                  RENOVATE_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  RENOVATE_TOKEN: ${{ secrets.ROBOT_PAT }}
                   RENOVATE_CONFIG_FILE: ${{ github.workspace }}/renovate-config.js
                   LOG_LEVEL: error
               run: |

diff --git a/renovate-config.js b/renovate-config.js
@@ -1,14 +1,45 @@
 module.exports = {
-    extends: ["config:recommended", "group:allNonMajor"],
-    major: { dependencyDashboardApproval: true },
-    dependencyDashboard: true,
+    globalExtends: ["config:recommended"], // using this instead of "extends" solves the problem with order of the configuration
     repositories: ['zowe/api-layer'],
     baseBranches: ["v2.x.x","v3.x.x"],
+    dependencyDashboard: true,
+    packageRules: [
+        {
+            //for v2.x.x branch ignore grouping from extends preset, find all packages which are patches,
+            // slug them and make PR with name "all patch dependencies"
+            "matchBaseBranches": ["v2.x.x"],
+            "groupName": "all patch dependencies",
+            "groupSlug": "all-patch",
+            "matchPackageNames": ["*"],
+            "matchUpdateTypes": ["patch"],
+        },
+        {
+            //for v2.x.x make dashboard approval to all major and minor dependencies updates
+            "matchBaseBranches": ["v2.x.x"],
+            "matchUpdateTypes": ["major", "minor"],
+            "dependencyDashboardApproval": true,
+        },
+        {
+            //for v3.x.x branch find all packages which are minor and patches,
+            // slug them and make PR with name "all non-major dependencies"
+            "matchBaseBranches": ["v3.x.x"],
+            "groupName": "all non-major dependencies",
+            "groupSlug": "all-minor-patch",
+            "matchPackageNames": ["*"],
+            "matchUpdateTypes": ["minor", "patch"]
+        },
+        {
+            //for v3.x.x make dashboard approval to all major dependencies updates
+            "matchBaseBranches": ["v3.x.x"],
+            "matchUpdateTypes": ["major"],
+            "dependencyDashboardApproval": true,
+        }
+    ],
     printConfig: true,
-    labels: ["dependencies"],
-    dependencyDashboardLabels: ["dependencies"],
+    labels: ['dependencies'],
+    dependencyDashboardLabels: ['dependencies'],
     commitMessagePrefix: 'chore: ',
     prHourlyLimit: 0, // removes rate limit for PR creation per hour
-    npmrc: "legacy-peer-deps=true", //for updating lock-files
+    npmrc: 'legacy-peer-deps=true', //for updating lock-files
     npmrcMerge: true //be combined with a "global" npmrc
 };