refactor: rename docker-compose -> docker

Reviewed-on: #91
Co-authored-by: Timo Behrendt <t.behrendt@t00n.de>
Co-committed-by: Timo Behrendt <t.behrendt@t00n.de>

.gitea/workflows/ci.yaml

@@ -11,11 +11,14 @@ jobs:
       matrix:
         json-file:
           - "action.json"
+          - "actions.json"
           - "k8s.json"
           - "helm.json"
           - "common.json"
           - "docker-compose.json"
+          - "docker.json"
           - "bun-npm.json"
+          - "npm.json"
           - "golang.json"
     steps:
       - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0

action.json

@@ -1,79 +1,4 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
+  "extends": ["local>t.behrendt/actions"]
-    "local>t.behrendt/renovate-configs:common",
-    "helpers:pinGitHubActionDigests"
-  ],
-  "packageRules": [
-    {
-      "matchManagers": ["github-actions"],
-      "addLabels": ["deps", "action"]
-    },
-    {
-      "matchManagers": ["github-actions"],
-      "matchUpdateTypes": ["minor", "patch"],
-      "groupName": "actions"
-    },
-    {
-      "matchManagers": ["github-actions"],
-      "matchUpdateTypes": ["minor", "patch"],
-      "matchPackageNames": [
-        "actions/checkout",
-        "actions/cache",
-        "actions/cache/*",
-        "actions/setup-go",
-        "azure/setup-kubectl",
-        "azure/setup-helm",
-        "azure/k8s-set-context",
-        "azure/k8s-create-secret",
-        "azure/k8s-deploy",
-        "azure/k8s-lint",
-        "helmfile/helmfile-action",
-        "docker/setup-buildx-action",
-        "docker/login-action",
-        "docker/build-push-action",
-        "oven-sh/setup-bun"
-      ],
-      "automerge": true,
-      "platformAutomerge": true,
-      "automergeType": "pr",
-      "addLabels": ["automerge"]
-    },
-    {
-      "matchManagers": ["github-actions"],
-      "matchUpdateTypes": ["minor", "patch"],
-      "matchPackageNames": [
-        "t.behrendt/actions",
-        "t.behrendt/actions/*",
-        "t.behrendt/conventional-semantic-git-tag-increment",
-        "t.behrendt/k_deploy_workflows",
-        "t.behrendt/validate-json-by-json-schema-action"
-      ],
-      "matchRegistryUrls": ["https://gitea.t000-n.de/**"],
-      "automerge": true,
-      "platformAutomerge": true,
-      "automergeType": "pr",
-      "addLabels": ["automerge"]
-    },
-    {
-      "matchManagers": ["github-actions"],
-      "matchUpdateTypes": ["major"],
-      "matchPackageNames": ["actions/checkout"],
-      "matchNewValue": "v7.0.0",
-      "automerge": true,
-      "platformAutomerge": true,
-      "automergeType": "pr",
-      "addLabels": ["automerge"]
-    },
-    {
-      "matchManagers": ["github-actions"],
-      "matchUpdateTypes": ["major"],
-      "matchPackageNames": ["actions/cache"],
-      "matchNewValue": "v6.0.0",
-      "automerge": true,
-      "platformAutomerge": true,
-      "automergeType": "pr",
-      "addLabels": ["automerge"]
-    }
-  ]
 }

actions.json

@@ -0,0 +1,79 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "local>t.behrendt/renovate-configs:common",
+    "helpers:pinGitHubActionDigests"
+  ],
+  "packageRules": [
+    {
+      "matchManagers": ["github-actions"],
+      "addLabels": ["deps", "action"]
+    },
+    {
+      "matchManagers": ["github-actions"],
+      "matchUpdateTypes": ["minor", "patch"],
+      "groupName": "actions"
+    },
+    {
+      "matchManagers": ["github-actions"],
+      "matchUpdateTypes": ["minor", "patch"],
+      "matchPackageNames": [
+        "actions/checkout",
+        "actions/cache",
+        "actions/cache/*",
+        "actions/setup-go",
+        "azure/setup-kubectl",
+        "azure/setup-helm",
+        "azure/k8s-set-context",
+        "azure/k8s-create-secret",
+        "azure/k8s-deploy",
+        "azure/k8s-lint",
+        "helmfile/helmfile-action",
+        "docker/setup-buildx-action",
+        "docker/login-action",
+        "docker/build-push-action",
+        "oven-sh/setup-bun"
+      ],
+      "automerge": true,
+      "platformAutomerge": true,
+      "automergeType": "pr",
+      "addLabels": ["automerge"]
+    },
+    {
+      "matchManagers": ["github-actions"],
+      "matchUpdateTypes": ["minor", "patch"],
+      "matchPackageNames": [
+        "t.behrendt/actions",
+        "t.behrendt/actions/*",
+        "t.behrendt/conventional-semantic-git-tag-increment",
+        "t.behrendt/k_deploy_workflows",
+        "t.behrendt/validate-json-by-json-schema-action"
+      ],
+      "matchRegistryUrls": ["https://gitea.t000-n.de/**"],
+      "automerge": true,
+      "platformAutomerge": true,
+      "automergeType": "pr",
+      "addLabels": ["automerge"]
+    },
+    {
+      "matchManagers": ["github-actions"],
+      "matchUpdateTypes": ["major"],
+      "matchPackageNames": ["actions/checkout"],
+      "matchNewValue": "v7.0.0",
+      "automerge": true,
+      "platformAutomerge": true,
+      "automergeType": "pr",
+      "addLabels": ["automerge"]
+    },
+    {
+      "matchManagers": ["github-actions"],
+      "matchUpdateTypes": ["major"],
+      "matchPackageNames": ["actions/cache"],
+      "matchNewValue": "v6.0.0",
+      "automerge": true,
+      "platformAutomerge": true,
+      "automergeType": "pr",
+      "addLabels": ["automerge"]
+    }
+  ]
+}

bun-npm.json

@@ -1,32 +1,4 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["local>t.behrendt/renovate-configs:common"],
+  "extends": ["local>t.behrendt/renovate-configs:npm"]
-  "packageRules": [
-    {
-      "matchManagers": ["npm", "bun"],
-      "addLabels": ["deps", "npm"]
-    },
-    {
-      "description": "Group all minor and patch updates together",
-      "groupName": "all non-major dependencies",
-      "groupSlug": "all-minor-patch",
-      "matchUpdateTypes": ["minor", "patch"],
-      "matchManagers": ["npm", "bun"]
-    },
-    {
-      "description": "Group Bun runtime version",
-      "groupName": "bun version",
-      "groupSlug": "bun-version",
-      "matchManagers": ["bun-version"],
-      "matchPackageNames": ["Bun", "bun"]
-    },
-    {
-      "description": "Group Bun Docker image",
-      "groupName": "bun version",
-      "groupSlug": "bun-version",
-      "matchDatasources": ["docker"],
-      "matchPackageNames": ["docker.io/oven/bun", "oven/bun"],
-      "additionalBranchPrefix": ""
-    }
-  ]
 }

common.json

@@ -19,6 +19,33 @@
       "minimumReleaseAge": "7 days",
       "minimumReleaseAgeBehaviour": "timestamp-required",
       "internalChecksFilter": "strict"
+    },
+    {
+      "matchManagers": ["renovate-config"],
+      "matchPackageNames": ["local>t.behrendt/renovate-configs:action"],
+      "replacementName": "local>t.behrendt/renovate-configs:actions",
+      "automerge": true,
+      "platformAutomerge": true,
+      "automergeType": "pr",
+      "addLabels": ["automerge"]
+    },
+    {
+      "matchManagers": ["renovate-config"],
+      "matchPackageNames": ["local>t.behrendt/renovate-configs:bun-npm"],
+      "replacementName": "local>t.behrendt/renovate-configs:npm",
+      "automerge": true,
+      "platformAutomerge": true,
+      "automergeType": "pr",
+      "addLabels": ["automerge"]
+    },
+    {
+      "matchManagers": ["renovate-config"],
+      "matchPackageNames": ["local>t.behrendt/renovate-configs:docker-compose"],
+      "replacementName": "local>t.behrendt/renovate-configs:docker",
+      "automerge": true,
+      "platformAutomerge": true,
+      "automergeType": "pr",
+      "addLabels": ["automerge"]
     }
   ],
   "osvVulnerabilityAlerts": true,

docker-compose.json

@@ -1,10 +1,4 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["local>t.behrendt/renovate-configs:common"],
+  "extends": ["local>t.behrendt/renovate-configs:docker"]
-  "docker-compose": {
-    "digest": {
-      "enabled": true
-    },
-    "addLabels": ["deps", "docker"]
-  }
 }

docker.json

@@ -0,0 +1,10 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["local>t.behrendt/renovate-configs:common"],
+  "docker-compose": {
+    "digest": {
+      "enabled": true
+    },
+    "addLabels": ["deps", "docker"]
+  }
+}

npm.json

@@ -0,0 +1,32 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["local>t.behrendt/renovate-configs:common"],
+  "packageRules": [
+    {
+      "matchManagers": ["npm", "bun"],
+      "addLabels": ["deps", "npm"]
+    },
+    {
+      "description": "Group all minor and patch updates together",
+      "groupName": "all non-major dependencies",
+      "groupSlug": "all-minor-patch",
+      "matchUpdateTypes": ["minor", "patch"],
+      "matchManagers": ["npm", "bun"]
+    },
+    {
+      "description": "Group Bun runtime version",
+      "groupName": "bun version",
+      "groupSlug": "bun-version",
+      "matchManagers": ["bun-version"],
+      "matchPackageNames": ["Bun", "bun"]
+    },
+    {
+      "description": "Group Bun Docker image",
+      "groupName": "bun version",
+      "groupSlug": "bun-version",
+      "matchDatasources": ["docker"],
+      "matchPackageNames": ["docker.io/oven/bun", "oven/bun"],
+      "additionalBranchPrefix": ""
+    }
+  ]
+}

renovate.json

@@ -1,4 +1,7 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["local>t.behrendt/renovate-configs:action"]
+  "extends": [
+    "local>t.behrendt/renovate-configs:action",
+    "local>t.behrendt/renovate-configs:bun-npm"
+  ]
 }