From e9ac9a23c253975b0f570161830f305e06875480 Mon Sep 17 00:00:00 2001
From: Christopher Willis-Ford <7019101+cwillisf@users.noreply.github.com>
Date: Mon, 26 Jul 2021 14:06:28 -0700
Subject: [PATCH] use scratch-renovate-config:conservative, customized
Prevent auto-merge for scratch-vm to avoid depdency update cycle
---
.gitattributes | 1 +
renovate.json | 6 ------
renovate.json5 | 16 ++++++++++++++++
3 files changed, 17 insertions(+), 6 deletions(-)
delete mode 100644 renovate.json
create mode 100644 renovate.json5
diff --git a/.gitattributes b/.gitattributes
index 919d9f29..4724b47d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -14,6 +14,7 @@
*.js text eol=lf
*.js.map text eol=lf
*.json text eol=lf
+*.json5 text eol=lf
*.md text eol=lf
*.vert text eol=lf
*.xml text eol=lf
diff --git a/renovate.json b/renovate.json
deleted file mode 100644
index 3cf4d595..00000000
--- a/renovate.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "$schema": "https://docs.renovatebot.com/renovate-schema.json",
- "extends": [
- "local>LLK/renovate-config"
- ]
-}
diff --git a/renovate.json5 b/renovate.json5
new file mode 100644
index 00000000..8d2002c3
--- /dev/null
+++ b/renovate.json5
@@ -0,0 +1,16 @@
+{
+ "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+
+ "extends": [
+ "github>LLK/scratch-renovate-config:conservative"
+ ],
+
+ "packageRules": [
+ // Don't auto-merge scratch-vm since that will cause a never-ending cycle of dependency updates. Ideally, updating
+ // scratch-vm in scratch-render shouldn't make a scratch-render release. Once that's true we can remove this rule.
+ {
+ "matchPackageNames": ["scratch-vm"],
+ "automerge": false
+ }
+ ]
+}