Skip to content

Commit 767782f

Browse files
LucaBernsteinLucaBernstein
authored
Fix Renovate update resolution for ocm.software/open-component-model/bindings/go/oci and add grouping for OCM (#27)
* Fix Renovate update resolution for `ocm.software/open-component-model/bindings/go/oci` * Group OCM updates and add pin for script to find the appropriate section to edit via `generate`
1 parent 7d16911 commit 767782f

4 files changed

Lines changed: 27 additions & 22 deletions

File tree

‎.github/renovate.json5‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,18 @@ The following dependencies have been updated:\n\
1515
- `{{upgrade.depName}}` from `{{upgrade.currentVersion}}` to `{{upgrade.newVersion}}`. {{#if (equals upgrade.datasource 'github-releases')}}[Release Notes](https://github.com/{{upgrade.depName}}/releases/tag/{{upgrade.newVersion}}){{/if}}\n\
1616
{{/each}}\n\
1717
```",
18-
// The following list of dependencies is updated by `make generate` and restricts updates to type `patch`.
19-
// DO NOT EDIT THIS SECTION MANUALLY.
2018
packageRules: [
19+
{
20+
matchDatasources: ['go'],
21+
groupName: "open-component-model",
22+
matchPackageNames: ["/ocm.software/open-component-model/"],
23+
},
24+
// The following list of dependencies is updated by `make generate` and restricts updates to type `patch`.
25+
// DO NOT EDIT THIS SECTION MANUALLY.
2126
{
2227
matchUpdateTypes: ["major", "minor"],
2328
enabled: false,
24-
matchPackageNames: [
29+
matchPackageNames: [ // GENERATOR-PIN
2530
"github.com/Masterminds/sprig/v3",
2631
"github.com/ahmetb/gen-crd-api-reference-docs",
2732
"github.com/go-logr/logr",

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ require (
2424
k8s.io/code-generator v0.34.2
2525
k8s.io/component-base v0.34.2
2626
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
27-
ocm.software/open-component-model/bindings/go/descriptor/runtime v0.0.0-20251204121648-0188eaee25f1
27+
ocm.software/open-component-model/bindings/go/descriptor/runtime v0.0.0-20251204125915-cb295d402227
2828
ocm.software/open-component-model/bindings/go/descriptor/v2 v2.0.1-alpha4
29-
ocm.software/open-component-model/bindings/go/oci v0.0.9-0.20251005214347-de41d9d78cc0
29+
ocm.software/open-component-model/bindings/go/oci v0.0.18
3030
ocm.software/open-component-model/bindings/go/runtime v0.0.4
3131
oras.land/oras-go/v2 v2.6.0
3232
sigs.k8s.io/controller-runtime v0.22.4
@@ -112,8 +112,8 @@ require (
112112
k8s.io/klog v1.0.0 // indirect
113113
k8s.io/klog/v2 v2.130.1 // indirect
114114
k8s.io/kube-openapi v0.0.0-20250814151709-d7b6acb124c3 // indirect
115-
ocm.software/open-component-model/bindings/go/blob v0.0.9 // indirect
116-
ocm.software/open-component-model/bindings/go/repository v0.0.2 // indirect
115+
ocm.software/open-component-model/bindings/go/blob v0.0.10 // indirect
116+
ocm.software/open-component-model/bindings/go/repository v0.0.4 // indirect
117117
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
118118
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
119119
sigs.k8s.io/randfill v1.0.0 // indirect

‎go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
3939
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4040
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
4141
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
42-
github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
43-
github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
42+
github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ=
43+
github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
4444
github.com/emicklei/go-restful/v3 v3.13.0 h1:C4Bl2xDndpU6nJ4bc1jXd+uTmYPVUwkD6bFY/oTyCes=
4545
github.com/emicklei/go-restful/v3 v3.13.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
4646
github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU=
@@ -277,8 +277,8 @@ github.com/stoewer/go-strcase v1.3.1/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8w
277277
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
278278
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
279279
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
280-
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
281-
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
280+
github.com/stretchr/objx v0.5.3 h1:jmXUvGomnU1o3W/V5h2VEradbpJDwGrzugQQvL0POH4=
281+
github.com/stretchr/objx v0.5.3/go.mod h1:rDQraq+vQZU7Fde9LOZLr8Tax6zZvy4kuNKF+QYS+U0=
282282
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
283283
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
284284
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
@@ -495,18 +495,18 @@ k8s.io/metrics v0.34.2 h1:zao91FNDVPRGIiHLO2vqqe21zZVPien1goyzn0hsz90=
495495
k8s.io/metrics v0.34.2/go.mod h1:Ydulln+8uZZctUM8yrUQX4rfq/Ay6UzsuXf24QJ37Vc=
496496
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzkbzn+gDM4X9T4Ck=
497497
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
498-
ocm.software/open-component-model/bindings/go/blob v0.0.9 h1:XNK04PnqvsE6KHx/04mYrr2LiKtZk+b6i0rd28r6EGQ=
499-
ocm.software/open-component-model/bindings/go/blob v0.0.9/go.mod h1:BjErnbAzzY4mJ6cO/hIFj8Gf/v9zerkIQ1Y1XQEOB5M=
500-
ocm.software/open-component-model/bindings/go/ctf v0.2.0 h1:BGZ+irknUVjZkOjL5j5bK5shmGWbOjpszfuETkPndVw=
501-
ocm.software/open-component-model/bindings/go/ctf v0.2.0/go.mod h1:L9JjTdoWDybr2YY9zXCsCAtNLracxW3aMK2f2TrqYZo=
502-
ocm.software/open-component-model/bindings/go/descriptor/runtime v0.0.0-20251204121648-0188eaee25f1 h1:hx4RR09/QgrfDmstRzAFruoUvBCV++r46z1tSeH0mnI=
503-
ocm.software/open-component-model/bindings/go/descriptor/runtime v0.0.0-20251204121648-0188eaee25f1/go.mod h1:qG0wDZOvJHhln6pl9wtyamch3sM966VS9Ya3Sc8P7Wc=
498+
ocm.software/open-component-model/bindings/go/blob v0.0.10 h1:obAa1xSeoOqu7QfFTz2rvSSAsqXoilXPscQPN5Cyi64=
499+
ocm.software/open-component-model/bindings/go/blob v0.0.10/go.mod h1:ZBMUfs2JfIIAy8nhJMimxDJC0+KCUmegBPHuBYXjs+M=
500+
ocm.software/open-component-model/bindings/go/ctf v0.3.0 h1:u1B26OgUvR+gzTwY0hTVdZgFIXv5uwdI8reEvCcjNV4=
501+
ocm.software/open-component-model/bindings/go/ctf v0.3.0/go.mod h1:skMxA1l7rZFhKsjn8CysSVG31zjmV95WaFqMVKRjHug=
502+
ocm.software/open-component-model/bindings/go/descriptor/runtime v0.0.0-20251204125915-cb295d402227 h1:BrCvsj0/w/qc/ALGfaZmADEiUru0Kg9McQ8AiMbnRtI=
503+
ocm.software/open-component-model/bindings/go/descriptor/runtime v0.0.0-20251204125915-cb295d402227/go.mod h1:qG0wDZOvJHhln6pl9wtyamch3sM966VS9Ya3Sc8P7Wc=
504504
ocm.software/open-component-model/bindings/go/descriptor/v2 v2.0.1-alpha4 h1:4kOvjb18s/OU0xAnFqDbZyQ21FYMxhZKCfL3h10h8GQ=
505505
ocm.software/open-component-model/bindings/go/descriptor/v2 v2.0.1-alpha4/go.mod h1:JtwbzfsuN7kmzu79unMgJVQDmPwTM0dL3NMLAIwoD1k=
506-
ocm.software/open-component-model/bindings/go/oci v0.0.9-0.20251005214347-de41d9d78cc0 h1:SeudRSD8dIEf73G4OOytdJbnBnmJmr1F4PsdbWl0m28=
507-
ocm.software/open-component-model/bindings/go/oci v0.0.9-0.20251005214347-de41d9d78cc0/go.mod h1:E2Iw4HFgVgYKVFBFtBunp+uvwYHJHEUgbE++dZZTUx8=
508-
ocm.software/open-component-model/bindings/go/repository v0.0.2 h1:O2fp4AWtbfrjGn+rhYaJfxaLibVwQXJ0XqckVYTKtyc=
509-
ocm.software/open-component-model/bindings/go/repository v0.0.2/go.mod h1:WUkvMtap6mxQAqVQBCmi+clmT73jLsE9a1Ig6NMPkXA=
506+
ocm.software/open-component-model/bindings/go/oci v0.0.18 h1:FICmXjMeSld29100S4FJphcH8f7YyKfgNWU7CQ3EjxQ=
507+
ocm.software/open-component-model/bindings/go/oci v0.0.18/go.mod h1:2+mEmUzTTWJc5cT36hXTINJ1QfpjPEOwPkrb2wf4iQs=
508+
ocm.software/open-component-model/bindings/go/repository v0.0.4 h1:pDh8tHTaE8PtBwiX/JTb/E3+n0bPpZAexvfvrNO9ASI=
509+
ocm.software/open-component-model/bindings/go/repository v0.0.4/go.mod h1:v1ROvp4Hmq5q3t4Mg2gPUqoOJn4ENFaOVmd1XBXKdj4=
510510
ocm.software/open-component-model/bindings/go/runtime v0.0.4 h1:Z4r5MKj8tDXATzZNNnfJuTIpDw0/bvQ1XzuqcAcSRcE=
511511
ocm.software/open-component-model/bindings/go/runtime v0.0.4/go.mod h1:iokVCXI30cn36PM05bBBaDGeXpz0hbgU9ObTtdP26Eo=
512512
oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc=

‎hack/generate-renovate-ignore-deps.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@ ignore_deps=$(printf ',"%s"' "${common_dependencies[@]}") # Add a comma to the b
5252
ignore_deps="[${ignore_deps:1}]" # Remove the leading comma and wrap the string in square brackets to format it as a JSON array.
5353

5454
# Format the JSON array as a string, indent it, and use sed to replace the lines between the markers
55-
echo "$ignore_deps" | yq -o json '.[]' | sed 's/^/ /; s/$/,/' | sed -i -e ' / matchPackageNames: \[/, /\]/{//!d;}' -e ' / matchPackageNames: \[/r /dev/stdin' $RENOVATE_CONFIG
55+
echo "$ignore_deps" | yq -o json '.[]' | sed 's/^/ /; s/$/,/' | sed -i -e ' / matchPackageNames: \[ \/\/ GENERATOR-PIN/, /\]/{//!d;}' -e ' / matchPackageNames: \[ \/\/ GENERATOR-PIN/r /dev/stdin' $RENOVATE_CONFIG

0 commit comments

Comments
 (0)