From ac8a04fd402048a59dc039c0f5322da777a4a485 Mon Sep 17 00:00:00 2001 From: Remco Beckers Date: Wed, 21 Oct 2026 11:01:52 +0200 Subject: [PATCH 1/3] Pin Renovate configuration to v1.0.0 --- .github/workflows/auto-approve-bot-prs.yml | 2 +- .github/workflows/renovate.yml | 2 +- renovate.json | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/auto-approve-bot-prs.yml b/.github/workflows/auto-approve-bot-prs.yml index 4509a69d..d0925836 100644 --- a/.github/workflows/auto-approve-bot-prs.yml +++ b/.github/workflows/auto-approve-bot-prs.yml @@ -20,7 +20,7 @@ jobs: pull-requests: read steps: - name: Approve verified Renovate PRs - uses: StackVista/renovate-config/.github/actions/auto-approve-renovate@c308265fc9a7ee7aecaf1590383094214045049a # main + uses: StackVista/renovate-config/.github/actions/auto-approve-renovate@005e342f15c5481932542b5552b23cdd21e624a9 # v1.0.0 with: app-client-id: ${{ vars.RENOVATE_APPROVAL_GH_APP_CLIENT_ID }} app-private-key: ${{ secrets.RENOVATE_APPROVAL_GH_APP_PRIVATE_KEY }} diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml index dac93137..39fa1244 100644 --- a/.github/workflows/renovate.yml +++ b/.github/workflows/renovate.yml @@ -10,7 +10,7 @@ permissions: jobs: renovate: - uses: StackVista/renovate-config/.github/workflows/renovate.yml@c308265fc9a7ee7aecaf1590383094214045049a # main + uses: StackVista/renovate-config/.github/workflows/renovate.yml@005e342f15c5481932542b5552b23cdd21e624a9 # v1.0.0 with: docker_registry_1: quay.io docker_registry_1_username: ${{ vars.QUAY_USER }} diff --git a/renovate.json b/renovate.json index 541cf6ea..d8aa9a3b 100644 --- a/renovate.json +++ b/renovate.json @@ -1,10 +1,10 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "github>StackVista/renovate-config#c308265fc9a7ee7aecaf1590383094214045049a", - "github>StackVista/renovate-config:go#c308265fc9a7ee7aecaf1590383094214045049a", - "github>StackVista/renovate-config:docker#c308265fc9a7ee7aecaf1590383094214045049a", - "github>StackVista/renovate-config:automerge#c308265fc9a7ee7aecaf1590383094214045049a" + "github>StackVista/renovate-config#005e342f15c5481932542b5552b23cdd21e624a9", + "github>StackVista/renovate-config:go#005e342f15c5481932542b5552b23cdd21e624a9", + "github>StackVista/renovate-config:docker#005e342f15c5481932542b5552b23cdd21e624a9", + "github>StackVista/renovate-config:automerge#005e342f15c5481932542b5552b23cdd21e624a9" ], "packageRules": [ { From aee0a4d9e9b97712c73cd1fe68301d23b0c99542 Mon Sep 17 00:00:00 2001 From: Remco Beckers Date: Wed, 21 Oct 2026 13:50:17 +0200 Subject: [PATCH 2/3] Keep Renovate release pins updateable --- renovate.json | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index d8aa9a3b..5d141ed0 100644 --- a/renovate.json +++ b/renovate.json @@ -13,6 +13,20 @@ "github.com/StackVista/sketches-go" ], "enabled": false + }, + { + "matchManagers": [ + "custom.regex", + "github-actions" + ], + "matchPackageNames": [ + "StackVista/renovate-config" + ], + "groupName": "Renovate configuration", + "groupSlug": "renovate-config", + "separateMajorMinor": false, + "separateMinorPatch": false, + "automerge": false } ], "customManagers": [ @@ -23,6 +37,23 @@ "(?(?:quay\\.io/stackstate/datadog_build_(?:system-probe|deb)_(?:x64|arm64)|registry\\.suse\\.com/bci/bci-micro)):(?[^\\s@]+)@(?sha256:[a-f0-9]{64})" ], "datasourceTemplate": "docker" + }, + { + "customType": "regex", + "description": "Track the release behind shared Renovate preset SHA pins.", + "managerFilePatterns": [ + "/(^|/)renovate\\.json$/" + ], + "matchStringsStrategy": "recursive", + "matchStrings": [ + "^[\\s\\S]*\"description\"\\s*:\\s*\"Renovate release (?v[0-9]+\\.[0-9]+\\.[0-9]+)\"[\\s\\S]*$", + "^[\\s\\S]*?(?:local|github)>StackVista/renovate-config(?:(?::|//)[^\"#]+)?#(?[a-f0-9]{40})[\\s\\S]*$" + ], + "depNameTemplate": "StackVista/renovate-config", + "datasourceTemplate": "github-tags", + "versioningTemplate": "semver", + "autoReplaceStringTemplate": "{{{replace '((?:local|github)>StackVista/renovate-config(?:(?::|//)[^\"#]+)?#)[a-f0-9]{40}' (replace 'SHA' newDigest '$1SHA') (replace '(\"description\"\\s*:\\s*\"Renovate release )v[0-9]+\\.[0-9]+\\.[0-9]+' (replace 'VERSION' newValue '$1VERSION') replaceString)}}}" } - ] + ], + "description": "Renovate release v1.0.0" } From c389ae15f1a4d133b7dce47fc8a2e1c09b98699d Mon Sep 17 00:00:00 2001 From: Remco Beckers Date: Wed, 21 Oct 2026 15:02:04 +0200 Subject: [PATCH 3/3] Use Renovate configuration v1.1.0 --- .github/workflows/auto-approve-bot-prs.yml | 2 +- .github/workflows/renovate.yml | 2 +- renovate.json | 29 +++++----------------- 3 files changed, 8 insertions(+), 25 deletions(-) diff --git a/.github/workflows/auto-approve-bot-prs.yml b/.github/workflows/auto-approve-bot-prs.yml index d0925836..fee01df8 100644 --- a/.github/workflows/auto-approve-bot-prs.yml +++ b/.github/workflows/auto-approve-bot-prs.yml @@ -20,7 +20,7 @@ jobs: pull-requests: read steps: - name: Approve verified Renovate PRs - uses: StackVista/renovate-config/.github/actions/auto-approve-renovate@005e342f15c5481932542b5552b23cdd21e624a9 # v1.0.0 + uses: StackVista/renovate-config/.github/actions/auto-approve-renovate@9e21a606e5995439dc37b1da98754da9983989a0 # v1.1.0 with: app-client-id: ${{ vars.RENOVATE_APPROVAL_GH_APP_CLIENT_ID }} app-private-key: ${{ secrets.RENOVATE_APPROVAL_GH_APP_PRIVATE_KEY }} diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml index 39fa1244..d957f5f6 100644 --- a/.github/workflows/renovate.yml +++ b/.github/workflows/renovate.yml @@ -10,7 +10,7 @@ permissions: jobs: renovate: - uses: StackVista/renovate-config/.github/workflows/renovate.yml@005e342f15c5481932542b5552b23cdd21e624a9 # v1.0.0 + uses: StackVista/renovate-config/.github/workflows/renovate.yml@9e21a606e5995439dc37b1da98754da9983989a0 # v1.1.0 with: docker_registry_1: quay.io docker_registry_1_username: ${{ vars.QUAY_USER }} diff --git a/renovate.json b/renovate.json index 5d141ed0..aae0ba56 100644 --- a/renovate.json +++ b/renovate.json @@ -1,10 +1,10 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "github>StackVista/renovate-config#005e342f15c5481932542b5552b23cdd21e624a9", - "github>StackVista/renovate-config:go#005e342f15c5481932542b5552b23cdd21e624a9", - "github>StackVista/renovate-config:docker#005e342f15c5481932542b5552b23cdd21e624a9", - "github>StackVista/renovate-config:automerge#005e342f15c5481932542b5552b23cdd21e624a9" + "github>StackVista/renovate-config#v1.1.0", + "github>StackVista/renovate-config:go#v1.1.0", + "github>StackVista/renovate-config:docker#v1.1.0", + "github>StackVista/renovate-config:automerge#v1.1.0" ], "packageRules": [ { @@ -16,7 +16,7 @@ }, { "matchManagers": [ - "custom.regex", + "renovate-config", "github-actions" ], "matchPackageNames": [ @@ -37,23 +37,6 @@ "(?(?:quay\\.io/stackstate/datadog_build_(?:system-probe|deb)_(?:x64|arm64)|registry\\.suse\\.com/bci/bci-micro)):(?[^\\s@]+)@(?sha256:[a-f0-9]{64})" ], "datasourceTemplate": "docker" - }, - { - "customType": "regex", - "description": "Track the release behind shared Renovate preset SHA pins.", - "managerFilePatterns": [ - "/(^|/)renovate\\.json$/" - ], - "matchStringsStrategy": "recursive", - "matchStrings": [ - "^[\\s\\S]*\"description\"\\s*:\\s*\"Renovate release (?v[0-9]+\\.[0-9]+\\.[0-9]+)\"[\\s\\S]*$", - "^[\\s\\S]*?(?:local|github)>StackVista/renovate-config(?:(?::|//)[^\"#]+)?#(?[a-f0-9]{40})[\\s\\S]*$" - ], - "depNameTemplate": "StackVista/renovate-config", - "datasourceTemplate": "github-tags", - "versioningTemplate": "semver", - "autoReplaceStringTemplate": "{{{replace '((?:local|github)>StackVista/renovate-config(?:(?::|//)[^\"#]+)?#)[a-f0-9]{40}' (replace 'SHA' newDigest '$1SHA') (replace '(\"description\"\\s*:\\s*\"Renovate release )v[0-9]+\\.[0-9]+\\.[0-9]+' (replace 'VERSION' newValue '$1VERSION') replaceString)}}}" } - ], - "description": "Renovate release v1.0.0" + ] }