diff --git a/.github/renovate.json b/.github/renovate.json index 84f5e13..02ca871 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -1,73 +1,61 @@ { "$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}}" + "# renovate: datasource=(?.*?)(?:\\s+extractVersion=(?.+?))?(?:\\s+versioning=(?.+?))?\\s+depName=(?.+?)?\\s(?:.*_(?:version|VERSION):\\s+(?.*))?(?:(\\s)?.*_(?:ref|REF):\\s+(?.*))?" + ] }, { + "customType": "regex", + "datasourceTemplate": "github-tags", + "depNameTemplate": "siderolabs/bldr", + "versioningTemplate": "semver", "fileMatch": [ - "Pkgfile", - "Makefile" + "Pkgfile" ], "matchStrings": [ "ghcr.io\\/siderolabs\\/bldr:(?v.*)" - ], - "depNameTemplate": "siderolabs/bldr", - "datasourceTemplate": "github-tags", - "versioningTemplate": "semver" + ] } ], "packageRules": [ { + "groupName": "dependencies", + "matchUpdateTypes": [ + "major", + "minor", + "patch", + "pin", + "digest" + ] + }, + { + "versioning": "regex:^(?\\d+)\\.(?\\d+)\\.?(?\\d+)?$", "matchPackageNames": [ "u-boot/u-boot", "ARM-software/arm-trusted-firmware" - ], - "versioning": "regex:^(?\\d+)\\.(?\\d+)\\.?(?\\d+)?$" + ] }, { - "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" + "versioning": "regex:^\\d+\\.(?\\d{4})(?\\d{2})(?\\d{2})$", + "matchPackageNames": [ + "raspberrypi/firmware" + ] } - ] + ], + "separateMajorMinor": false } diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index dc4bb4f..69eb005 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-12-02T11:48:54Z by kres 232fe63. +# Generated on 2024-12-18T18:53:05Z by kres fcff05e. name: default concurrency: @@ -31,7 +31,7 @@ jobs: if: (!startsWith(github.head_ref, 'renovate/') && !startsWith(github.head_ref, 'dependabot/')) services: buildkitd: - image: moby/buildkit:v0.17.2 + image: moby/buildkit:v0.18.2 options: --privileged ports: - 1234:1234 diff --git a/.kres.yaml b/.kres.yaml index dd6da13..3df4183 100644 --- a/.kres.yaml +++ b/.kres.yaml @@ -17,3 +17,14 @@ kind: common.Build spec: ignoredPaths: - go.work.sum +--- +kind: common.Renovate +spec: + packageRules: + - matchPackageNames: + - u-boot/u-boot + - ARM-software/arm-trusted-firmware + versioning: 'regex:^(?\d+)\.(?\d+)\.?(?\d+)?$' + - matchPackageNames: + - raspberrypi/firmware + versioning: 'regex:^\d+\.(?\d{4})(?\d{2})(?\d{2})$' diff --git a/Makefile b/Makefile index 67b8ea8..4bc077f 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-12-02T11:50:46Z by kres 232fe63. +# Generated on 2024-12-18T18:53:05Z by kres fcff05e. # common variables @@ -124,7 +124,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'