Install golangci-lint from binary #363
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -50,14 +50,31 @@ CHLOGGEN_CONFIG := .chloggen/config.yaml | |
| JUNIT_OUT_DIR ?= $(TOOLS_MOD_DIR)/testresults | ||
|
|
||
| .PHONY: install-tools | ||
| install-tools: $(TOOLS_BIN_NAMES) $(TOOLS_BIN_DIR)/golangci-lint | ||
|
|
||
| $(TOOLS_BIN_DIR): | ||
| mkdir -p $@ | ||
|
|
||
| $(TOOLS_BIN_NAMES): $(TOOLS_BIN_DIR) $(TOOLS_MOD_DIR)/go.mod | ||
| cd $(TOOLS_MOD_DIR) && GOOS="" GOARCH="" $(GOCMD) build -o $@ -trimpath $(filter %/$(notdir $@),$(TOOLS_PKG_NAMES)) | ||
|
|
||
| # === CWA Fork === | ||
| # One of the build dependency repo's for golangci-lint no longer exists so we are unable to build golangci-lint from source | ||
| # The golangci-lint maintainers ran into this problem: https://github.com/golangci/golangci-lint/issues/6017 | ||
| # They have unreleased fix: https://github.com/golangci/golangci-lint/pull/6018 | ||
| # Install golangci-lint by downloading the binary directly instead | ||
| # We should remove this block once golangci-lint releases a fix, the fix is pulled into OTel upstream repo, and we | ||
| # sync with OTel upstream | ||
| $(TOOLS_BIN_DIR)/golangci-lint: $(TOOLS_BIN_DIR) | ||
| @(\ | ||
| flock -x 200; \ | ||
| if [ ! -f $@ ]; then \ | ||
| echo "Downloading golangci-lint..."; \ | ||
| curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s -- -b $(TOOLS_BIN_DIR) v2.1.1; \ | ||
| fi \ | ||
| ) 200>[email protected] | ||
| # === CWA Fork === | ||
|
|
||
| ADDLICENSE := $(TOOLS_BIN_DIR)/addlicense | ||
| MDLINKCHECK := $(TOOLS_BIN_DIR)/markdown-link-check | ||
| MISSPELL := $(TOOLS_BIN_DIR)/misspell -error | ||
|
|
@@ -211,7 +228,7 @@ fmt: $(GOFUMPT) $(GOIMPORTS) | |
| $(GOIMPORTS) -w -local github.com/open-telemetry/opentelemetry-collector-contrib ./ | ||
|
|
||
| .PHONY: lint | ||
| lint: $(LINT) checklicense misspell | ||
| $(LINT) run | ||
|
|
||
| .PHONY: govulncheck | ||
|
|
||
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
v2.1.1 was chosen as that is the version that was used in the
internal/tools/go.modfile previously, so this will keep the linting rules consistent. Trying to use the latest version caused additional linting rules to identify linting issues.