fix: adjustments to minimize CI costs responsibly

reside-eng · Oct 8, 2024 · 5170632 · 5170632
1 parent 15203b8
commit 5170632
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/default.json b/default.json
@@ -17,6 +17,7 @@
   "platformCommit": "enabled",
   "automergeType": "pr",
   "automergeStrategy": "squash",
+  "rebaseWhen": "conflicted",
   "lockFileMaintenance": {
     "enabled": true,
     "automerge": true,
@@ -117,6 +118,12 @@
       "description": "Prevent upgrade of Eslint to v9 until updates are made",
       "matchPackageNames": ["eslint"],
       "allowedVersions": "^8"
+    },
+    {
+      "description": "Disable auto-merge for all major releases",
+      "matchUpdateTypes": ["major"],
+      "rebaseWhen": "never",
+      "automerge": false
     }
   ]
 }
diff --git a/library.json b/library.json
@@ -5,6 +5,7 @@
   "automergeType": "pr",
   "automergeStrategy": "squash",
   "automerge": true,
+  "rebaseWhen": "auto",
   "packageRules": [
     {
       "description": "Weekly npm dependencies maintenance (grouped minor + patch updates)",
@@ -45,6 +46,7 @@
     {
       "description": "Disable auto-merge for all major releases",
       "matchUpdateTypes": ["major"],
+      "rebaseWhen": "never",
       "automerge": false
     }
   ]