Makefile: use go1.22 semantics for gofumpt #5684
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gofumpt defaults to using the go version from go.mod, but as we don't have one, we need to set it explicitly. Signed-off-by: Sebastiaan van Stijn <[email protected]>
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #5684 +/- ##
==========================================
- Coverage 59.53% 59.50% -0.03%
==========================================
Files 346 346
Lines 29371 29371
==========================================
- Hits 17486 17478 -8
- Misses 10914 10923 +9
+ Partials 971 970 -1 |
laurazard
approved these changes
Dec 18, 2024
vvoland
approved these changes
Dec 18, 2024
| @@ -52,7 +52,7 @@ shellcheck: ## run shellcheck validation | |||
| .PHONY: fmt | |||
| fmt: ## run gofumpt (if present) or gofmt | |||
| @if command -v gofumpt > /dev/null; then \ | |||
| gofumpt -w -d -lang=1.21 . ; \ | |||
| gofumpt -w -d -lang=1.23 . ; \ | |||
There was a problem hiding this comment.
nit: We could probably have a variable on the top of the file so it's more discoverable
There was a problem hiding this comment.
Hm. Yeah, I was considering a bit how we could improve this, and went a bit back-and-forth;
- It's not really critical (switching did not result in a diff, so looks like there were no version-specific changes)
- It should no longer be needed when we have a
go.mod, so .. 🤞 should go away in the near future (so didn't want to add the extra code-churn) - but I think we should look if we can containerise this (add a
docker baketarget); that way we would remove the requirement to havegofumptinstalled, and make sure that we run it in a consistent environment (and expected version of go) - ☝️ similar to how we do vendoring
- Was actually asking @crazy-max Yesterday (i.e., should we have some templates for such things?); related to Gofumpt all the things compose#12392 (comment)
|
Let me bring this one in, but if I have some time, I may have a look if we can containerise this (per above) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
gofumpt defaults to using the go version from go.mod, but as we don't have one, we need to set it explicitly.
- A picture of a cute animal (not mandatory but encouraged)