Skip to content

Commit

Permalink
Inherit golangci-lint version from build submodule
Browse files Browse the repository at this point in the history
* Motivation: golangci-lint base run was freezing on Mac M1 and go1.20.5.
* Remove the version override in the Makefile with the comment and consume the latest version from the build
* Presumably, it was a fix around consume a lot of memory on go1.20rc3 golangci/golangci-lint#3470 helped in the latest golangci-lint release
* Update build submodule to consume upbound/build#238

Signed-off-by: Yury Tsarev <yury@upbound.io>
  • Loading branch information
ytsarev committed Aug 14, 2023
1 parent d82def4 commit 7b47392
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@ GO_TEST_PARALLEL := $(shell echo $$(( $(NPROCS) / 2 )))
export GOPRIVATE = github.com/upbound/*

GO_REQUIRED_VERSION ?= 1.19
GOLANGCILINT_VERSION ?= 1.50.0
# GOLANGCILINT_VERSION is inherited from build submodule by default.
# Uncomment below if you need to override the version.
# GOLANGCILINT_VERSION ?= 1.54.0

# SUBPACKAGES ?= $(shell find cmd/provider -type d -maxdepth 1 -mindepth 1 | cut -d/ -f3)
SUBPACKAGES ?= monolith
GO_STATIC_PACKAGES ?= $(GO_PROJECT)/cmd/generator ${SUBPACKAGES:%=$(GO_PROJECT)/cmd/provider/%}
Expand Down
2 changes: 1 addition & 1 deletion build

0 comments on commit 7b47392

Please sign in to comment.