Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(gomod): avoid duplicating "incompatible" metadata #17867

Merged
merged 3 commits into from Sep 28, 2022
Merged

fix(gomod): avoid duplicating "incompatible" metadata #17867

merged 3 commits into from Sep 28, 2022

Conversation

maxbrunet
Copy link
Contributor

Changes

Avoid adding +incompatible if it is already in the new value.

Context

Spotted on PR parca-dev/parca-agent#818

diff --git a/go.mod b/go.mod
index d67bb1a09..706b3900b 100644
--- a/go.mod
+++ b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/cenkalti/backoff/v4 v4.1.3
 	github.com/cespare/xxhash/v2 v2.1.2
 	github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be
-	github.com/docker/docker v20.10.17+incompatible
+	github.com/docker/docker v20.10.18+incompatible+incompatible
 	github.com/dustin/go-humanize v1.0.0
 	github.com/go-kit/log v0.2.1
 	github.com/goburrow/cache v0.1.4

Fixes #17089

Documentation (please check one with an [x])

  • I have updated the documentation, or
  • No documentation update is required

How I've tested my work (please tick one)

I have verified these changes via:

  • Code inspection only, or
  • Newly added/modified unit tests, or
  • No unit tests but ran on a real repository, or
  • Both unit tests + ran on a real repository

@rarkins rarkins enabled auto-merge (squash) September 20, 2022 07:08
@maxbrunet
Copy link
Contributor Author

@rarkins @viceice could you click "Update branch" to get it merged, please?

@viceice
Copy link
Member

viceice commented Sep 28, 2022

@rarkins @viceice could you click "Update branch" to get it merged, please?

you can do it yourself on your PR's 😉 shouldn't remove the approval

@maxbrunet
Copy link
Contributor Author

you can do it yourself on your PR's 😉 shouldn't remove the approval

Since I am not a maintainer / do not have write access, it will disable auto-merge, so you might have to click that then, let me give it a try 😁

@maxbrunet
Copy link
Contributor Author

Never mind, looking good, either GitHub changed something or it depends on the branch protection rule

@rarkins rarkins merged commit e64739c into renovatebot:main Sep 28, 2022
@maxbrunet maxbrunet deleted the fix/gomod/duplicate-incompatible branch September 28, 2022 17:37
@renovate-release
Copy link
Collaborator

🎉 This PR is included in version 32.208.3 🎉

The release is available on:

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 30, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Golang parse 'incompatible' component of semver
4 participants