Skip to content

Conversation

@apostasie
Copy link
Contributor

This upgrades golangci-lint to v2, cleans-up the Makefile a bit, and a few cosmetic cleanups of the codebase in preparation for more drastic changes.

- update to golangci v2
- remove dependency on go-imports-reviser (in favor of golangci provided gci)
- remove useless tasks
- remove hack make-license

Signed-off-by: apostasie <[email protected]>
##########################
# High-level tasks definitions
##########################
lint: lint-go-all lint-imports lint-yaml lint-shell lint-commits lint-headers lint-mod lint-licenses-all
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

imports (lint and fix) are now provided by golangci-lint with gci.

Separate tasks and module are no longer necessary.

##########################
lint-go:
$(call title, $@)
$(call title, $@: $(GOOS))
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Clarifies output.

$(call title, $@)
$(call title, $@: $(GOOS))
@cd $(MAKEFILE_DIR) \
&& ./hack/make-lint-licenses.sh
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Separate hack is no longer necessary.

@AkihiroSuda AkihiroSuda added this to the v2.0.5 milestone Mar 27, 2025
@AkihiroSuda AkihiroSuda added the area/ci e.g., CI failure label Mar 27, 2025
- satisfy updated golangci-lint
- simplify code
- simplify func signatures
- enhance documentation a bit

Signed-off-by: apostasie <[email protected]>
@apostasie
Copy link
Contributor Author

CI panic logged in #4043

@apostasie apostasie changed the title [CI] Tigron breakout from #4040 [CI] Tigron breakout: golangci v2 and cleanups Mar 27, 2025
Copy link
Member

@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@AkihiroSuda AkihiroSuda merged commit 3a6ceb2 into containerd:main Mar 27, 2025
30 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/ci e.g., CI failure

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants