Skip to content

Commit

Permalink
Bumping deps and setting Renovate rules for them to avoid problems wh…
Browse files Browse the repository at this point in the history
…en bumping (#1171)

* Bumping some deps

* Adding rule for docker
  • Loading branch information
ljakimczuk authored Sep 13, 2023
1 parent 84ccdcb commit 481dca4
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/cli v20.10.17+incompatible // indirect
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/docker/docker v20.10.17+incompatible // indirect
github.com/docker/docker v23.0.1+incompatible // indirect
github.com/docker/docker-credential-helpers v0.6.4 // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-metrics v0.0.1 // indirect
Expand Down Expand Up @@ -191,7 +191,7 @@ replace (
github.com/gogo/protobuf v1.3.1 => github.com/gogo/protobuf v1.3.2
github.com/hashicorp/consul/api v1.12.0 => github.com/hashicorp/consul/api v1.15.2
// Use mergo 0.3.11 due to bug in 0.3.9 merging Go structs.
github.com/imdario/mergo => github.com/imdario/mergo v0.3.15
github.com/imdario/mergo => github.com/imdario/mergo v0.3.16
github.com/microcosm-cc/bluemonday v1.0.2 => github.com/microcosm-cc/bluemonday v1.0.18
github.com/nats-io/nats-server/v2 v2.5.0 => github.com/nats-io/nats-server/v2 v2.9.11
github.com/opencontainers/runc v0.1.1 => github.com/opencontainers/runc v1.0.0-rc7
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -493,8 +493,8 @@ github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq
github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM=
github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc=
github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
Expand Down
5 changes: 5 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
},
{
"excludePackagePatterns": [".*giantswarm.*" ,"^k8s.io", "^sigs.k8s.io"],
"excludePackageNames": ["github.com/imdario/mergo"],
"groupName": "misc modules"
},
{
Expand All @@ -30,6 +31,10 @@
"matchPackageNames": ["sigs.k8s.io/controller-runtime"],
"allowedVersions": "< 0.7.0"
},
{
"matchPackageNames": ["github.com/docker/docker"],
"allowedVersions": "<= v23.0.1+incompatible"
},
{
"matchPackagePatterns": ["^github.com/giantswarm/apiextensions*"],
"allowedVersions": ">= 4.0.0"
Expand Down

0 comments on commit 481dca4

Please sign in to comment.