From dac0cd3267a6fe8310baf6cbe707cbb8eb2d6ac3 Mon Sep 17 00:00:00 2001 From: Jan Unterbrink Date: Thu, 19 Nov 2026 19:06:07 +0100 Subject: [PATCH 1/2] ci: automerge low-risk Renovate updates, keep the MQTT path manual Automerges non-major CI tooling, golang image patches and Go module patches (grouped weekly), once CI passes. The MQTT client, the Go toolchain and all majors stay manual. Pins Actions to digests and validates the Renovate config in CI. Co-Authored-By: Claude Opus 5.5 --- .github/renovate.json | 56 +++++++++++++++++++++++++++++++++++++-- .github/workflows/ci.yaml | 15 +++++++++++ 2 files changed, 69 insertions(+), 2 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 0012bdc..2b970e5 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -1,6 +1,58 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": ["config:recommended"], + "extends": [ + "config:recommended", + "helpers:pinGitHubActionDigests", + "customManagers:githubActionsVersions" + ], + "timezone": "Europe/Berlin", "automerge": false, - "timezone": "Europe/Berlin" + "platformAutomerge": false, + "automergeType": "pr", + "automergeSchedule": ["* 9-18 * * *"], + "schedule": ["* 0-7 * * 6"], + "updateNotScheduled": false, + "minimumReleaseAge": "3 days", + "postUpdateOptions": ["gomodTidy"], + "packageRules": [ + { + "description": "CI tooling (Actions, golangci-lint, helm in ci.yaml) never reaches the flat: automerge non-major updates and digest pins once CI passes", + "matchManagers": ["github-actions", "custom.regex"], + "matchUpdateTypes": ["minor", "patch", "digest", "pin", "pinDigest"], + "automerge": true + }, + { + "description": "golang build image patches are mostly security fixes; CI builds and tests the image, and chore(deps) does not cut a release", + "matchDatasources": ["docker"], + "matchPackageNames": ["golang"], + "matchUpdateTypes": ["patch", "digest"], + "automerge": true + }, + { + "description": "Go module patches (metrics, OpenAPI runtime, yaml) in one weekly PR, so at most one release a week. Deploying it stays a manual PR in smart-home", + "matchManagers": ["gomod"], + "matchUpdateTypes": ["patch"], + "matchPackageNames": ["!github.com/eclipse/paho.mqtt.golang"], + "groupName": "go modules (patch)", + "automerge": true + }, + { + "description": "The MQTT client carries every TRV command: always manual, and a week for regressions to show up", + "matchPackageNames": ["github.com/eclipse/paho.mqtt.golang"], + "automerge": false, + "minimumReleaseAge": "7 days", + "addLabels": ["heating-path"] + }, + { + "description": "The Go directive and toolchain change compiler and runtime behaviour: manual", + "matchDepNames": ["go", "toolchain"], + "automerge": false + }, + { + "description": "Majors are always manual", + "matchUpdateTypes": ["major"], + "automerge": false, + "addLabels": ["major"] + } + ] } diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d6ef61f..3299c6e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,6 +14,10 @@ on: permissions: contents: read +env: + # renovate: datasource=npm depName=renovate + RENOVATE_VERSION: 44.221.1 + jobs: test: runs-on: ubuntu-latest @@ -50,6 +54,17 @@ jobs: - run: helm lint charts/heating-control -f charts/heating-control/ci-values.yaml - run: helm template test charts/heating-control -f charts/heating-control/ci-values.yaml + # --strict also fails when Renovate would want to migrate the config. + renovate-config: + if: github.event_name == 'pull_request' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v7 + - uses: actions/setup-node@v7 + with: + node-version: 24 + - run: npx --yes --package "renovate@${RENOVATE_VERSION}" -- renovate-config-validator --strict + # Builds without pushing, so a broken Dockerfile shows up in the PR. image: if: github.event_name == 'pull_request' From b2e3fa199f330caff70da925c01b733fb5621520 Mon Sep 17 00:00:00 2001 From: Jan Unterbrink Date: Thu, 19 Nov 2026 19:08:43 +0100 Subject: [PATCH 2/2] ci: validate with the hosted Renovate version Co-Authored-By: Claude Opus 5.5 --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3299c6e..b6bade0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,7 +16,7 @@ permissions: env: # renovate: datasource=npm depName=renovate - RENOVATE_VERSION: 44.221.1 + RENOVATE_VERSION: 44.253.4 jobs: test: