From 611ca38153fece4f2b34519325fbca22d34db7a0 Mon Sep 17 00:00:00 2001 From: Noel Georgi Date: Wed, 18 Dec 2024 20:14:41 +0530 Subject: [PATCH] chore: rekres to bring renovate under kres Kresify renovate config. Signed-off-by: Noel Georgi --- .github/renovate.json | 91 ++++++++++++++--------------------- .github/workflows/ci.yaml | 6 +-- .github/workflows/weekly.yaml | 4 +- .kres.yaml | 55 +++++++++++++++++++++ Makefile | 4 +- 5 files changed, 99 insertions(+), 61 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index d49f9992..197773a2 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -1,56 +1,70 @@ { "$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": [ { + "groupName": "dependencies", + "matchUpdateTypes": [ + "major", + "minor", + "patch", + "pin", + "digest" + ] + }, + { + "allowedVersions": "<= 6.12", "matchPackageNames": [ "git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git" - ], - "allowedVersions": "<= 6.12" + ] }, { + "versioning": "regex:^(?\\d+)_(?\\d+)_?(?\\d+)?$", "matchPackageNames": [ "ipmitool/ipmitool", "git://sourceware.org/git/lvm2.git" - ], - "versioning": "regex:^(?\\d+)_(?\\d+)_?(?\\d+)?$" + ] }, { + "versioning": "regex:^(?\\d{4})(?\\d{2})(?\\d{2})\\.?(?\\d+)?$", "matchPackageNames": [ "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" - ], - "versioning": "regex:^(?\\d{4})(?\\d{2})(?\\d{2})\\.?(?\\d+)?$" + ] }, { + "versioning": "regex:^(?\\d+)\\.(?\\d+)\\.?(?\\d+)?$", "matchPackageNames": [ "git://git.kernel.org/pub/scm/boot/syslinux/syslinux.git", "git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git", @@ -63,60 +77,29 @@ "SELinuxProject/selinux", "git://git.liburcu.org/userspace-rcu.git", "git://git.kernel.org/pub/scm/libs/libcap/libcap.git" - ], - "versioning": "regex:^(?\\d+)\\.(?\\d+)\\.?(?\\d+)?$" + ] }, { + "versioning": "regex:^(?\\d+)\\.?(?\\d+)?\\.?(?\\d+)?$", "matchPackageNames": [ "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git", "benhoyt/inih", "systemd/systemd" - ], - "versioning": "regex:^(?\\d+)\\.?(?\\d+)?\\.?(?\\d+)?$" + ] }, { + "versioning": "regex:^(?\\d+)\\.(?\\d+)\\.?(?\\d+)?\\.?(?\\d+)?$", "matchPackageNames": [ "git://repo.or.cz/socat.git", "json-c/json-c" - ], - "versioning": "regex:^(?\\d+)\\.(?\\d+)\\.?(?\\d+)?\\.?(?\\d+)?$" + ] }, { + "versioning": "regex:^(?\\d+)\\.(?\\d+)\\.?(?[0-9]{1}[0-8]{0,1})?$", "matchPackageNames": [ "openzfs/zfs" - ], - "versioning": "regex:^(?\\d+)\\.(?\\d+)\\.?(?[0-9]{1}[0-8]{0,1})?$" - }, - { - "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" + ] } - ] + ], + "separateMajorMinor": false } diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 41df4fdd..082aba20 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-26T10:08:56Z by kres 232fe63. +# Generated on 2024-12-18T08:06:55Z 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 @@ -137,7 +137,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 bb011803..c2e3859b 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-26T10:08:56Z by kres 232fe63. +# Generated on 2024-12-18T08:06:55Z 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 e1f217b1..e0ba9ebc 100644 --- a/.kres.yaml +++ b/.kres.yaml @@ -86,3 +86,58 @@ spec: $(MAKE) docker-kernel-prepare PLATFORM=$$platform BUILDKIT_MULTI_PLATFORM=0 TARGET_ARGS="--tag=$(REGISTRY)/$(USERNAME)/kernel:$(TAG)-$$arch --load"; \ docker run --rm -it --entrypoint=/toolchain/bin/bash -e PATH=/toolchain/bin:/bin -w /src -v $$PWD/kernel/build/config-$$arch:/host/.hostconfig $(REGISTRY)/$(USERNAME)/kernel:$(TAG)-$$arch -c 'cp /host/.hostconfig .config && make $* && cp .config /host/.hostconfig'; \ done +--- +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 + packageRules: + - matchPackageNames: + - git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git + allowedVersions: "<= 6.12" + - matchPackageNames: + - ipmitool/ipmitool + - git://sourceware.org/git/lvm2.git + versioning: 'regex:^(?\d+)_(?\d+)_?(?\d+)?$' + - matchPackageNames: + - git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git + versioning: 'regex:^(?\d{4})(?\d{2})(?\d{2})\.?(?\d+)?$' + - matchPackageNames: + - git://git.kernel.org/pub/scm/boot/syslinux/syslinux.git + - git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git + - nvidia/open-gpu-kernel-modules + - dosfstools/dosfstools + - git://git.savannah.gnu.org/grub.git + - https://pagure.io/libaio.git + - rpm-software-management/popt + - PCRE2Project/pcre2 + - SELinuxProject/selinux + - git://git.liburcu.org/userspace-rcu.git + - git://git.kernel.org/pub/scm/libs/libcap/libcap.git + versioning: 'regex:^(?\d+)\.(?\d+)\.?(?\d+)?$' + - matchPackageNames: + - git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git + - benhoyt/inih + - systemd/systemd + versioning: 'regex:^(?\d+)\.?(?\d+)?\.?(?\d+)?$' + - matchPackageNames: + - git://repo.or.cz/socat.git + - json-c/json-c + versioning: 'regex:^(?\d+)\.(?\d+)\.?(?\d+)?\.?(?\d+)?$' + - matchPackageNames: + - openzfs/zfs + versioning: 'regex:^(?\d+)\.(?\d+)\.?(?[0-9]{1}[0-8]{0,1})?$' diff --git a/Makefile b/Makefile index bb7c4073..a690f856 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-12-06T11:24:18Z by kres 232fe63. +# Generated on 2024-12-18T08:06:55Z by kres b9507d6. # common variables @@ -163,7 +163,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'