diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 7bc2fec..6483693 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -1,17 +1,14 @@ ---- -# yamllint disable rule:line-length name: Build talosctl+talhelper+sops image (push on main only) -on: # yamllint disable-line rule:truthy +on: push: - branches: ["**"] + branches: [ "**" ] workflow_dispatch: {} env: - # Configure these in your repository Settings → Variables/Secrets + # Configure these in your repository Settings → Variables/Secrets REGISTRY: ${{ vars.REGISTRY }} - # e.g. forgejo.example.com/owner/talos-tools - IMAGE_NAME: ${{ vars.IMAGE_NAME }} + IMAGE_NAME: ${{ vars.IMAGE_NAME }} # e.g. forgejo.example.com/owner/talos-tools jobs: build: @@ -98,4 +95,3 @@ jobs: run: | docker run --rm ${{ env.IMAGE_NAME }}:${{ steps.versions.outputs.tag }} sh -lc \ 'talosctl version --client && talhelper --version && sops --version' -... \ No newline at end of file diff --git a/renovate.json b/renovate.json index 13dc15d..c9344dd 100644 --- a/renovate.json +++ b/renovate.json @@ -3,13 +3,12 @@ "extends": [ "config:recommended" ], - "enabledManagers": ["custom.regex", "dockerfile"], + "enabledManagers": ["regex", "docker"], "pinDigests": true, - "customManagers": [ + "regexManagers": [ { - "customType": "regex", - "fileMatch": ["^Dockerfile$"], - "matchStrings": [ + "fileMatch": ["^Dockerfile$"] + ,"matchStrings": [ "#\\s*renovate:\\s*datasource=(?[^\\s]+)\\s+depName=(?[^\\s]+)\\s+versioning=(?[^\\s]+)\\nARG\\s+TALOSCTL_VERSION=(?[^\\n]+)" ], "datasourceTemplate": "{{{datasource}}}", @@ -19,9 +18,8 @@ "autoReplaceStringTemplate": "ARG TALOSCTL_VERSION={{newValue}}" }, { - "customType": "regex", - "fileMatch": ["^Dockerfile$"], - "matchStrings": [ + "fileMatch": ["^Dockerfile$"] + ,"matchStrings": [ "#\\s*renovate:\\s*datasource=(?[^\\s]+)\\s+depName=(?[^\\s]+)\\s+versioning=(?[^\\s]+)\\nARG\\s+TALHELPER_VERSION=(?[^\\n]+)" ], "datasourceTemplate": "{{{datasource}}}", @@ -31,9 +29,8 @@ "autoReplaceStringTemplate": "ARG TALHELPER_VERSION={{newValue}}" }, { - "customType": "regex", - "fileMatch": ["^Dockerfile$"], - "matchStrings": [ + "fileMatch": ["^Dockerfile$"] + ,"matchStrings": [ "#\\s*renovate:\\s*datasource=(?[^\\s]+)\\s+depName=(?[^\\s]+)\\s+versioning=(?[^\\s]+)\\nARG\\s+SOPS_VERSION=(?[^\\n]+)" ], "datasourceTemplate": "{{{datasource}}}", @@ -46,7 +43,7 @@ "packageRules": [ { "description": "Group all tool bumps into one PR", - "matchManagers": ["custom.regex"], + "matchManagers": ["regex"], "groupName": "talos tools versions", "prPriority": 0 }