From 611a3ec3d9e0319aa52d2467da44e2c421dec7d8 Mon Sep 17 00:00:00 2001 From: Giles Knap Date: Wed, 23 Sep 2026 20:59:59 +0000 Subject: [PATCH 1/2] Extend Renovate automerge to 0.x patches and CalVer IOC images Follow-up to #37, implementing the rules agreed in #35: - patch updates for dependencies still below 1.0.0 - all updates of ghcr.io/epics-containers/ioc-* images, which use CalVer so a year rollover is a "major" bump Refs #35 Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_014GsvY8MPA1WdKubZ76YVcd --- renovate.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/renovate.json b/renovate.json index 4912c68..c97600b 100644 --- a/renovate.json +++ b/renovate.json @@ -19,6 +19,23 @@ "matchUpdateTypes": ["minor", "patch"], "matchCurrentVersion": "!/^0/", "automerge": true + }, + { + "description": ["automerge patch changes for versions <1.0.0"], + "matchUpdateTypes": ["patch"], + "matchCurrentVersion": "/^0/", + "automerge": true + }, + { + "description": [ + "Generic IOC images use CalVer (e.g. 2026.9.1), so a new year looks", + "like a major bump. Any new release tag is intended for deployment,", + "so automerge all updates (CI must still pass)." + ], + "matchDatasources": ["docker"], + "matchPackageNames": ["/^ghcr\\.io/epics-containers/ioc-/"], + "matchUpdateTypes": ["major", "minor", "patch"], + "automerge": true } ], "customManagers": [ From baf56108843d0df52819b2b0532451fd0107deb5 Mon Sep 17 00:00:00 2001 From: Giles Knap Date: Wed, 23 Sep 2026 21:42:13 +0000 Subject: [PATCH 2/2] Address review: restrict IOC automerge to CalVer tags, cover epics-gateways chart - Add matchCurrentVersion /^20\d\d\./ to the ioc-* image rule so it only automerges majors for CalVer-pinned images (e.g. not ioc-asyn-runtime:4.46). - Add a matching rule for the epics-gateways helm chart, which is also CalVer and would otherwise need a manual merge on a year rollover. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Jd9gGzEQubx2j1kD6Q2s8a --- renovate.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/renovate.json b/renovate.json index c97600b..d05d26a 100644 --- a/renovate.json +++ b/renovate.json @@ -34,6 +34,18 @@ ], "matchDatasources": ["docker"], "matchPackageNames": ["/^ghcr\\.io/epics-containers/ioc-/"], + "matchCurrentVersion": "/^20\\d\\d\\./", + "matchUpdateTypes": ["major", "minor", "patch"], + "automerge": true + }, + { + "description": [ + "The epics-gateways helm chart is also CalVer; automerge all updates", + "so a year rollover does not wait for a manual merge." + ], + "matchDatasources": ["helm"], + "matchPackageNames": ["epics-gateways"], + "matchCurrentVersion": "/^20\\d\\d\\./", "matchUpdateTypes": ["major", "minor", "patch"], "automerge": true }