fix: skip minimum release age for internal docker deps (#90)

Should resolve #88

Docker images have the registry as part of the package name, therefore the current pattern didn't match them.

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

.bun-version

@@ -0,0 +1 @@
+1.3.14

.editorconfig

@@ -5,3 +5,4 @@ end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+max_line_length = 80

.gitea/workflows/cd.yaml

@@ -16,10 +16,10 @@ jobs:
           fetch-depth: 0
       - name: Increment tag
         id: tag
-        uses: https://gitea.t000-n.de/t.behrendt/conventional-semantic-git-tag-increment@b8806ee0141a44be30e8734dff15001361be100c # 0.1.35
+        uses: https://gitea.t000-n.de/t.behrendt/conventional-semantic-git-tag-increment@e393dbb067c09fd43519392572ccf63b66cba92d # 0.1.39
         with:
           token: ${{ secrets.GITEA_TOKEN }}
           prerelease: ${{ github.event_name == 'workflow_dispatch' }}
-      - uses: https://gitea.t000-n.de/t.behrendt/actions/release-git-tag@38c1bbd8bad3e7965744d03de85faa4a5b808d1b # 0.2.4
+      - uses: https://gitea.t000-n.de/t.behrendt/actions/release-git-tag@29f50ea246d5d9a62ac3c611fa5c8a6e9846df5a # 0.2.8
         with:
           tag: ${{ steps.tag.outputs.new-tag }}

.gitea/workflows/ci.yaml

@@ -16,9 +16,22 @@ jobs:
           - "common.json"
           - "docker-compose.json"
           - "bun-npm.json"
+          - "golang.json"
     steps:
       - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - name: Validate "${{ matrix.json-file }}"
-        uses: https://gitea.t000-n.de/t.behrendt/validate-json-by-json-schema-action@6bf2c1355ac4430a6fb77befd36fb95243fcaa3a # 0.1.12
+        uses: https://gitea.t000-n.de/t.behrendt/validate-json-by-json-schema-action@30070f7f9c7376fd87998980078688f61cecda59 # 0.1.13
         with:
           json-file: "./${{ matrix.json-file }}"
+
+  format:
+    name: Format
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
+        with:
+          bun-version-file: ".bun-version"
+      - run: bun install --frozen-lockfile
+      - name: Check formatting
+        run: bun run fmt:check

.gitignore

@@ -0,0 +1,2 @@
+# dependencies (bun install)
+node_modules

.oxfmtrc.json

@@ -0,0 +1,4 @@
+{
+  "$schema": "./node_modules/oxfmt/configuration_schema.json",
+  "ignorePatterns": []
+}

action.json

@@ -1,11 +1,44 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["local>t.behrendt/renovate-configs:common", "helpers:pinGitHubActionDigests"],
+  "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"],
@@ -14,28 +47,29 @@
         "t.behrendt/actions/*",
         "t.behrendt/conventional-semantic-git-tag-increment",
         "t.behrendt/k_deploy_workflows",
-        "t.behrendt/validate-json-by-json-schema-action",
-
-        "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"
+        "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",

bun-npm.json

@@ -2,6 +2,10 @@
   "$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",
@@ -10,11 +14,19 @@
       "matchManagers": ["npm", "bun"]
     },
     {
-      "description": "Group Bun releases",
+      "description": "Group Bun runtime version",
       "groupName": "bun version",
       "groupSlug": "bun-version",
-      "matchDatasources": ["github-tags", "docker"],
-      "matchPackageNames": ["docker.io/oven/bun", "oven-sh/bun", "Bun"]
+      "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": ""
     }
   ]
 }

bun.lock

@@ -0,0 +1,55 @@
+{
+  "lockfileVersion": 1,
+  "configVersion": 1,
+  "workspaces": {
+    "": {
+      "name": "renovate-configs",
+      "devDependencies": {
+        "oxfmt": "0.56.0",
+      },
+    },
+  },
+  "packages": {
+    "@oxfmt/binding-android-arm-eabi": ["@oxfmt/binding-android-arm-eabi@0.56.0", "", { "os": "android", "cpu": "arm" }, "sha512-CSCxi7ovYojgfdPOdUb9T508HKeAdDIKeRGg7x8IZwVJrWz9gVgX7MbUnFqtQAE4QvoNo07mj2JlwnOzJw4qqA=="],
+
+    "@oxfmt/binding-android-arm64": ["@oxfmt/binding-android-arm64@0.56.0", "", { "os": "android", "cpu": "arm64" }, "sha512-HYJFnd+PkDwf6S9ZPGzXXtjNqvRWFnnhdbWaouh4mi/SxU8wmDuzlMn3xo/wDTGnr4Q1VA7ZzOaE/D4biW0W6A=="],
+
+    "@oxfmt/binding-darwin-arm64": ["@oxfmt/binding-darwin-arm64@0.56.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-sftR/bEOr+t1gs+evwsHi/Xbq2FAPA2uU3VMr8n6ZU9PoK/IMSfnfu7+OEe/uy1+knhrFl4Wvy7Vkm3uo9mJ7g=="],
+
+    "@oxfmt/binding-darwin-x64": ["@oxfmt/binding-darwin-x64@0.56.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-z66SdjLqa3MUPKvTp3Mbb5nSjKSbnYxJGeB+Wx987s8T5hPcIRiBMfnJ6zcPgYtQn3x5xjvdzNVkXrSeYH6ZFg=="],
+
+    "@oxfmt/binding-freebsd-x64": ["@oxfmt/binding-freebsd-x64@0.56.0", "", { "os": "freebsd", "cpu": "x64" }, "sha512-t2tkrV1vtZyaItSQ71dTi2ZVKZEI39b/LqLT12V5KMfIeXK6N32TUC1jhOXKVQmhECq9j2ZXMQV3JeT1kh9Vmg=="],
+
+    "@oxfmt/binding-linux-arm-gnueabihf": ["@oxfmt/binding-linux-arm-gnueabihf@0.56.0", "", { "os": "linux", "cpu": "arm" }, "sha512-+gCy+Tp3RHeXQ9y/QrS76lXIpZkbziTyp6hIgjB2MssCwfMph3vG/GEfkhO34Rai1vhYIaUkvv8UT1BcDorJPw=="],
+
+    "@oxfmt/binding-linux-arm-musleabihf": ["@oxfmt/binding-linux-arm-musleabihf@0.56.0", "", { "os": "linux", "cpu": "arm" }, "sha512-0kKkVvQ2I+FJ2sxQyUu1zJ0yWP5kcWse/yVFnGQSFCXMwSSkfEaUGu0dW774O7nyy3jrcBGap7OSc8dZmU/CdA=="],
+
+    "@oxfmt/binding-linux-arm64-gnu": ["@oxfmt/binding-linux-arm64-gnu@0.56.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-npkA2siMbyWRh+wEhi1aTAx4RirukGcGNt8V4Ch86pG+xU9aurqS1MZOnKYMu03ISwat3rB6zkQx51SsB9obNw=="],
+
+    "@oxfmt/binding-linux-arm64-musl": ["@oxfmt/binding-linux-arm64-musl@0.56.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-UekqOjGkV4/MkqreCV9SPIB2jlR3/HbXrmhV1rVXJZ9wfDXMyCMriLtq3tHqLY4PkbVWNtfcm1kMojJ26KLSJw=="],
+
+    "@oxfmt/binding-linux-ppc64-gnu": ["@oxfmt/binding-linux-ppc64-gnu@0.56.0", "", { "os": "linux", "cpu": "ppc64" }, "sha512-XSzveSpeZMD5XJpew5lRFVtNnT04xd3rJxENXmk7wkZzN9oWzv2aFJyoNDhOtoz69BYaS/fg4SYl+CfEZRpB0Q=="],
+
+    "@oxfmt/binding-linux-riscv64-gnu": ["@oxfmt/binding-linux-riscv64-gnu@0.56.0", "", { "os": "linux", "cpu": "none" }, "sha512-EkQ0nJa7k7HDDIVuPF7WY+k4k+bzdclLYtyIXNt7/OqVghfNiMym6YGppFBgx1XRIHW6QylxBz5OogumPjPJbQ=="],
+
+    "@oxfmt/binding-linux-riscv64-musl": ["@oxfmt/binding-linux-riscv64-musl@0.56.0", "", { "os": "linux", "cpu": "none" }, "sha512-dyjAGW8jKRge0ik6U/dgvQG0nVpA3iBlRskQTz5qJLvQWIrySxX5jpqzPetLBNIIZ231KA82fDdi1nLTk8ENCw=="],
+
+    "@oxfmt/binding-linux-s390x-gnu": ["@oxfmt/binding-linux-s390x-gnu@0.56.0", "", { "os": "linux", "cpu": "s390x" }, "sha512-60ZGH3LtfqlW8X6vcLdSFY4lvCQYINurttYBKaALnHCDVAUCYJ1LsUgS6p1XOzVlzEDx3yNUZvDF1Lvt59zoZw=="],
+
+    "@oxfmt/binding-linux-x64-gnu": ["@oxfmt/binding-linux-x64-gnu@0.56.0", "", { "os": "linux", "cpu": "x64" }, "sha512-u1suj1tgJHK4ZqB7buCtdbNef2n8+d0lXTPJwLHNmtyK6p+DTpsaoDvmqhQrA56fgKYv4LuRxNtL8YooebKOew=="],
+
+    "@oxfmt/binding-linux-x64-musl": ["@oxfmt/binding-linux-x64-musl@0.56.0", "", { "os": "linux", "cpu": "x64" }, "sha512-aYGLvlQHt80y+qKEtfJY/Nm27G0125Lv+qyh9SJ4Cjc6lXnXjD+ndfhqQnbV24POpMi7rNRi0jvx/0d70FRpCQ=="],
+
+    "@oxfmt/binding-openharmony-arm64": ["@oxfmt/binding-openharmony-arm64@0.56.0", "", { "os": "none", "cpu": "arm64" }, "sha512-H/re/gO+7ysVc+kywHNuzY3C33EN9sQcZhg0kp1ZwOZl7y998ZE5mhnBiuGR/nYI0pqLL5xQfrHVUOJ/cIJsCA=="],
+
+    "@oxfmt/binding-win32-arm64-msvc": ["@oxfmt/binding-win32-arm64-msvc@0.56.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-6qLNXfXmtAs8jXDvYMkxk6Wec5SUJoew+ZX1uOZmqaR7ks0EJFbAohuOCELDyJMWyVlxotVG8Xf8m74Bfq0O2w=="],
+
+    "@oxfmt/binding-win32-ia32-msvc": ["@oxfmt/binding-win32-ia32-msvc@0.56.0", "", { "os": "win32", "cpu": "ia32" }, "sha512-UXEXuKphAe15bsob4AswNMArCw38XSmUIs3wk1s6e6MX9OWGW/IRWU95s1hZDiVg09STy1jHgyN2qkqbu1FT0w=="],
+
+    "@oxfmt/binding-win32-x64-msvc": ["@oxfmt/binding-win32-x64-msvc@0.56.0", "", { "os": "win32", "cpu": "x64" }, "sha512-HPyNDjky+NIOuaMvHZflR+kst3YWdUOH2JUQYkf99grqZ5mEBTQM6h9iGy501Z8Xt5xMScrwHOuVCOlqDrktRw=="],
+
+    "oxfmt": ["oxfmt@0.56.0", "", { "dependencies": { "tinypool": "2.1.0" }, "optionalDependencies": { "@oxfmt/binding-android-arm-eabi": "0.56.0", "@oxfmt/binding-android-arm64": "0.56.0", "@oxfmt/binding-darwin-arm64": "0.56.0", "@oxfmt/binding-darwin-x64": "0.56.0", "@oxfmt/binding-freebsd-x64": "0.56.0", "@oxfmt/binding-linux-arm-gnueabihf": "0.56.0", "@oxfmt/binding-linux-arm-musleabihf": "0.56.0", "@oxfmt/binding-linux-arm64-gnu": "0.56.0", "@oxfmt/binding-linux-arm64-musl": "0.56.0", "@oxfmt/binding-linux-ppc64-gnu": "0.56.0", "@oxfmt/binding-linux-riscv64-gnu": "0.56.0", "@oxfmt/binding-linux-riscv64-musl": "0.56.0", "@oxfmt/binding-linux-s390x-gnu": "0.56.0", "@oxfmt/binding-linux-x64-gnu": "0.56.0", "@oxfmt/binding-linux-x64-musl": "0.56.0", "@oxfmt/binding-openharmony-arm64": "0.56.0", "@oxfmt/binding-win32-arm64-msvc": "0.56.0", "@oxfmt/binding-win32-ia32-msvc": "0.56.0", "@oxfmt/binding-win32-x64-msvc": "0.56.0" }, "peerDependencies": { "svelte": "^5.0.0", "vite-plus": "*" }, "optionalPeers": ["svelte", "vite-plus"], "bin": { "oxfmt": "bin/oxfmt" } }, "sha512-9Dv0wV3zKiyvhjD7bRKaInKmHQ1sPx3RGOjQkGFJbbdQ16576yf8qhMSO9Q9cvHcs+1NpBsRTkuDDYFFPTJ6gw=="],
+
+    "tinypool": ["tinypool@2.1.0", "", {}, "sha512-Pugqs6M0m7Lv1I7FtxN4aoyToKg1C4tu+/381vH35y8oENM/Ai7f7C4StcoK4/+BSw9ebcS8jRiVrORFKCALLw=="],
+  }
+}

common.json

@@ -15,9 +15,7 @@
   "packageRules": [
     {
       "description": "Don't update dependencies unless they are at least 7 days old (except for internal deps).",
-      "matchPackageNames": [
-        "!t.behrendt/**"
-      ],
+      "matchPackageNames": ["!t.behrendt/**", "gitea.t000-n.de/t.behrendt/**"],
       "minimumReleaseAge": "7 days",
       "minimumReleaseAgeBehaviour": "timestamp-required",
       "internalChecksFilter": "strict"
@@ -30,10 +28,7 @@
     "automerge": true,
     "platformAutomerge": true,
     "automergeType": "pr",
-    "addLabels": [
-      "automerge",
-      "security"
-    ],
+    "addLabels": ["automerge", "security"],
     "vulnerabilityFixStrategy": "lowest"
   }
 }

golang.json

@@ -0,0 +1,15 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["local>t.behrendt/renovate-configs:common"],
+  "packageRules": [
+    {
+      "matchManagers": ["gomod"],
+      "addLabels": ["deps", "go"]
+    },
+    {
+      "matchPackageNames": ["golang", "gomod", "go"],
+      "groupName": "go version",
+      "matchUpdateTypes": ["major", "minor", "patch"]
+    }
+  ]
+}

helm.json

@@ -8,7 +8,8 @@
     {
       "matchManagers": ["helm-values"],
       "versioning": "docker",
-      "separateMinorPatch": true
+      "separateMinorPatch": true,
+      "addLabels": ["deps", "helm"]
     }
   ],
   "helmfile": {

k8s.json

@@ -4,5 +4,17 @@
   "kubernetes": {
     "enabled": true,
     "labels": ["deps", "k8s"]
-  }
+  },
+  "packageRules": [
+    {
+      "description": "Replace git-commit image tags with semver tags for backupsidecar",
+      "matchDatasources": ["docker"],
+      "matchManagers": ["kubernetes"],
+      "matchPackageNames": ["gitea.t000-n.de/t.behrendt/backupsidecar"],
+      "matchCurrentValue": "/^[a-f0-9]{40}$/",
+      "replacementVersion": "0.2.17",
+      "versioning": "semver",
+      "pinDigests": true
+    }
+  ]
 }

package.json

@@ -0,0 +1,11 @@
+{
+  "name": "renovate-configs",
+  "private": true,
+  "scripts": {
+    "fmt": "oxfmt -c .oxfmtrc.json",
+    "fmt:check": "oxfmt -c .oxfmtrc.json --check"
+  },
+  "devDependencies": {
+    "oxfmt": "0.56.0"
+  }
+}

renovate.json

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