From e5382fc5f05d7ccfdb7c95819195caceac8ffcbf Mon Sep 17 00:00:00 2001 From: Noel Georgi Date: Wed, 18 Dec 2024 20:54:38 +0530 Subject: [PATCH] chore: kresify renovate Bring renovate under kres control. Signed-off-by: Noel Georgi --- .github/renovate.json | 59 +++++++++++++---------------------- .github/workflows/ci.yaml | 6 ++-- .github/workflows/weekly.yaml | 4 +-- .kres.yaml | 19 +++++++++++ Makefile | 4 +-- 5 files changed, 47 insertions(+), 45 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 293f31d..5bd5010 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -1,66 +1,49 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "description": "THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.", + "prHeader": "Update Request | Renovate Bot", "extends": [ ":dependencyDashboard", ":gitSignOff", ":semanticCommitScopeDisabled", "schedule:earlyMondays" ], - "prHeader": "Update Request | Renovate Bot", - "regexManagers": [ + "customManagers": [ { + "customType": "regex", + "versioningTemplate": "{{#if versioning}}{{versioning}}{{else}}semver{{/if}}", "fileMatch": [ "Pkgfile" ], "matchStrings": [ "# renovate: datasource=(?.*?)(?:\\s+extractVersion=(?.+?))?(?:\\s+versioning=(?.+?))?\\s+depName=(?.+?)?\\s(?:\\s+.*_(?:version|VERSION):\\s+(?.*))?(?:\\s.*_(?:ref|REF):\\s+(?.*))?" - ], - "versioningTemplate": "{{#if versioning}}{{versioning}}{{else}}semver{{/if}}" + ] }, { + "customType": "regex", + "datasourceTemplate": "github-tags", + "depNameTemplate": "siderolabs/bldr", + "versioningTemplate": "semver", "fileMatch": [ "Pkgfile", "Makefile" ], "matchStrings": [ "ghcr.io\\/siderolabs\\/bldr:(?v.*)" - ], - "depNameTemplate": "siderolabs/bldr", - "datasourceTemplate": "github-tags", - "versioningTemplate": "semver" + ] } ], "packageRules": [ { - "matchPackagePatterns": [ - "*" - ], - "matchDatasources": [ - "docker" - ], - "groupName": "container images" - }, - { - "matchPackagePatterns": [ - "*" - ], - "matchDatasources": [ - "go", - "golang-version" - ], - "groupName": "go packages" - }, - { - "matchPackagePatterns": [ - "*" - ], - "matchDatasources": [ - "git-refs", - "git-tags", - "github-tags", - "github-releases" - ], - "groupName": "releases" + "groupName": "dependencies", + "matchUpdateTypes": [ + "major", + "minor", + "patch", + "pin", + "digest" + ] } - ] + ], + "separateMajorMinor": false } diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2a584c8..05030f7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-11-29T13:33:28Z by kres 232fe63. +# Generated on 2024-12-18T15:24:30Z by kres b9507d6. name: default concurrency: @@ -33,7 +33,7 @@ jobs: labels: ${{ steps.retrieve-pr-labels.outputs.result }} services: buildkitd: - image: moby/buildkit:v0.17.2 + image: moby/buildkit:v0.18.1 options: --privileged ports: - 1234:1234 @@ -129,7 +129,7 @@ jobs: - default services: buildkitd: - image: moby/buildkit:v0.17.2 + image: moby/buildkit:v0.18.1 options: --privileged ports: - 1234:1234 diff --git a/.github/workflows/weekly.yaml b/.github/workflows/weekly.yaml index 7520bae..00112c7 100644 --- a/.github/workflows/weekly.yaml +++ b/.github/workflows/weekly.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-11-29T13:33:28Z by kres 232fe63. +# Generated on 2024-12-18T15:24:30Z by kres b9507d6. name: weekly concurrency: @@ -16,7 +16,7 @@ jobs: - pkgs services: buildkitd: - image: moby/buildkit:v0.17.2 + image: moby/buildkit:v0.18.1 options: --privileged ports: - 1234:1234 diff --git a/.kres.yaml b/.kres.yaml index d0f0356..a0dd76f 100644 --- a/.kres.yaml +++ b/.kres.yaml @@ -5,3 +5,22 @@ spec: - install-cni - talosctl-cni-bundle-install reproducibleTargetName: reproducibility +--- +kind: common.Renovate +spec: + customManagers: + - customType: regex + fileMatch: + - Pkgfile + matchStrings: + - '# renovate: datasource=(?.*?)(?:\s+extractVersion=(?.+?))?(?:\s+versioning=(?.+?))?\s+depName=(?.+?)?\s(?:\s+.*_(?:version|VERSION):\s+(?.*))?(?:\s.*_(?:ref|REF):\s+(?.*))?' + versioningTemplate: "{{#if versioning}}{{versioning}}{{else}}semver{{/if}}" + - customType: regex + fileMatch: + - Pkgfile + - Makefile + matchStrings: + - ghcr.io\/siderolabs\/bldr:(?v.*) + depNameTemplate: siderolabs/bldr + datasourceTemplate: github-tags + versioningTemplate: semver diff --git a/Makefile b/Makefile index a5ec0f8..ed36b4c 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-11-29T13:33:28Z by kres 232fe63. +# Generated on 2024-12-18T15:24:30Z by kres b9507d6. # common variables @@ -118,7 +118,7 @@ local-%: ## Builds the specified target defined in the Pkgfile using the local echo $$platform; \ directory="$${platform//\//_}"; \ if [[ -d "$$DEST/$$directory" ]]; then \ - mv "$$DEST/$$directory/"* $$DEST; \ + mv -f "$$DEST/$$directory/"* $$DEST; \ rmdir "$$DEST/$$directory/"; \ fi; \ done'