From d3a8ef149a49d12f92adbe53de91a40b91744479 Mon Sep 17 00:00:00 2001 From: Aline Abler Date: Fri, 24 May 2024 12:29:33 +0200 Subject: [PATCH] Make patch automerging disable-able --- cookiecutter.json | 3 +++ {{ cookiecutter.slug }}/renovate.json | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/cookiecutter.json b/cookiecutter.json index ba2d034..fe0722a 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -11,6 +11,9 @@ "add_matrix": "y", "add_go_unit": "n", + "automerge_patch": "y", + "automerge_patch_v0": "n", + "copyright_holder": "VSHN AG ", "copyright_year": "1950", diff --git a/{{ cookiecutter.slug }}/renovate.json b/{{ cookiecutter.slug }}/renovate.json index dd37fe1..8886138 100644 --- a/{{ cookiecutter.slug }}/renovate.json +++ b/{{ cookiecutter.slug }}/renovate.json @@ -26,9 +26,12 @@ ], "separateMinorPatch": true, "packageRules": [ + {% if cookiecutter.automerge_patch == "y" %} { "matchUpdateTypes": ["patch"], + {% if cookiecutter.automerge_patch_v0 != "y" %} "matchCurrentVersion": "!/^v?0\\./",{# negative match: do not match versions that match regex `^v?0\.` #} + {% endif %} "automerge": true, {# We can't use Platform Automerge because the repositories are configured manually, so we can't be sure the "require status checks" option is always enabled, and without that, platformAutomerge does not wait for tests to pass. #} "platformAutomerge": false, @@ -37,6 +40,7 @@ "automerge" ] } + {% endif %} {# re: SYN-785 - Later rules take precedence, so add more specific package rules below. #} ] }