Skip to content

Commit

Permalink
#81 update makefiles to 9.3.1
Browse files Browse the repository at this point in the history
This includes the linter fixes, previously tested with
this operator.
  • Loading branch information
alexander-dammeier committed Oct 11, 2024
1 parent 3f37595 commit a9fbbae
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ ARTIFACT_ID=k8s-blueprint-operator
VERSION=1.1.0
IMAGE=cloudogu/${ARTIFACT_ID}:${VERSION}
GOTAG=1.23
MAKEFILES_VERSION=9.2.1
LINT_VERSION=v1.61.0
MAKEFILES_VERSION=9.3.1
STAGE?=production


Expand Down
2 changes: 1 addition & 1 deletion build/make/build.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
ADDITIONAL_LDFLAGS?=-extldflags -static
LDFLAGS?=-ldflags "$(ADDITIONAL_LDFLAGS) -X main.Version=$(VERSION) -X main.CommitID=$(COMMIT_ID)"
GOIMAGE?=golang
GOTAG?=1.22
GOTAG?=1.23
GOOS?=linux
GOARCH?=amd64
PRE_COMPILE?=
Expand Down
4 changes: 2 additions & 2 deletions build/make/static-analysis.mk
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

STATIC_ANALYSIS_DIR=$(TARGET_DIR)/static-analysis
GOIMAGE?=golang
GOTAG?=1.22
GOTAG?=1.23
CUSTOM_GO_MOUNT?=-v /tmp:/tmp

REVIEW_DOG=$(TMP_DIR)/bin/reviewdog
LINT=$(TMP_DIR)/bin/golangci-lint
LINT_VERSION?=v1.58.2
LINT_VERSION?=v1.61.0
# ignore tests and mocks
LINTFLAGS=--tests=false --exclude-files="^.*_mock.go$$" --exclude-files="^.*/mock.*.go$$" --timeout 10m --issues-exit-code 0
ADDITIONAL_LINTER=-E bodyclose -E containedctx -E contextcheck -E decorder -E dupl -E errname -E forcetypeassert -E funlen -E unparam
Expand Down

0 comments on commit a9fbbae

Please sign in to comment.