ci(renovate): automerge using branches

andreoliwa · May 18, 2023 · 86f830c · 86f830c
1 parent 6d98425
commit 86f830c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -2,6 +2,12 @@
   extends: ["config:base"],
   // https://docs.renovatebot.com/configuration-options/#automerge
   automerge: true,
+  // https://docs.renovatebot.com/configuration-options/#automergetype
+  automergeType: "branch",
+  // https://docs.renovatebot.com/modules/manager/pre-commit/
+  "pre-commit": {
+    enabled: true,
+  },
   ignoreDeps: ["jedi"],
   // https://docs.renovatebot.com/configuration-options/#prconcurrentlimit
   prConcurrentLimit: 3,

diff --git a/.gitignore b/.gitignore
@@ -47,6 +47,8 @@ coverage.xml
 *.cover
 .hypothesis/
 .pytest/
+# pytest-testmon
+.testmondata*
 
 # Translations
 *.mo
@@ -114,6 +116,3 @@ ENV/
 
 # macOS
 .DS_Store
-
-# pytest-testmon
-.testmondata