diff --git a/.renovaterc.json b/.renovaterc.json index a6e64efd..862e00ab 100644 --- a/.renovaterc.json +++ b/.renovaterc.json @@ -50,16 +50,6 @@ ] }, "packageRules": [ - { - "groupName": "renovate docker tag", - "matchDatasources": [ - "docker" - ], - "matchDepNames": [ - "ghcr.io/renovatebot/renovate", - "renovate/renovate" - ] - }, { "matchDepTypes": [ "action" @@ -117,6 +107,19 @@ }, "semanticCommitScope": "copier-template" }, + { + "description": "Group renovate docker tag and pre-commit-hooks tag", + "groupName": "renovate tag", + "matchDatasources": [ + "docker", + "github-tags" + ], + "matchDepNames": [ + "ghcr.io/renovatebot/renovate", + "renovate/renovate", + "renovatebot/pre-commit-hooks" + ] + }, { "description": "Group apt packages to avoid failure when multiple packages are outdated.", "groupName": "apt packages", diff --git a/template/.renovaterc.json.jinja b/template/.renovaterc.json.jinja index 88831c7e..a20c39c4 100644 --- a/template/.renovaterc.json.jinja +++ b/template/.renovaterc.json.jinja @@ -58,16 +58,6 @@ [%- endif %] "packageRules": [ [%- if project_name == "Serious Scaffold Python" %] - { - "groupName": "renovate docker tag", - "matchDatasources": [ - "docker" - ], - "matchDepNames": [ - "ghcr.io/renovatebot/renovate", - "renovate/renovate" - ] - }, { "matchDepTypes": [ "action" @@ -126,6 +116,23 @@ }, "semanticCommitScope": "copier-template" }, + { + "description": "Group renovate docker tag and pre-commit-hooks tag", + "groupName": "renovate tag", + "matchDatasources": [ + "docker", + "github-tags" + ], + "matchDepNames": [ +[%- if repo_host_type == "github.com" %] + "ghcr.io/renovatebot/renovate", +[%- endif %] +[%- if repo_host_type == "gitlab.com" or reop_host_type == "gitlab-self-managed" or project_name == "Serious Scaffold Python" %] + "renovate/renovate", +[%- endif %] + "renovatebot/pre-commit-hooks" + ] + }, { "description": "Group apt packages to avoid failure when multiple packages are outdated.", "groupName": "apt packages",