Skip to content

Commit afcba45

Browse files
authored
fix: use --timeout in place of deprecated --deadline for golangci-lint (#1439)
1 parent 5a1bffb commit afcba45

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ format: ## Format source code
6464

6565
lint: ## Lint, will not fix but sets exit code on error
6666
@which $(GOLINTER) > /dev/null || (echo "Installing $(GOLINTER)@$(GOLINTER_VERSION) ..."; go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLINTER_VERSION) && echo -e "Installation complete!\n")
67-
$(GOLINTER) run --deadline=10m $(SOURCE_PATHS)
67+
$(GOLINTER) run --timeout=10m $(SOURCE_PATHS)
6868

6969
lint-fix: ## Lint, will try to fix errors and modify code
7070
@which $(GOLINTER) > /dev/null || (echo "Installing $(GOLINTER)@$(GOLINTER_VERSION) ..."; go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLINTER_VERSION) && echo -e "Installation complete!\n")
71-
$(GOLINTER) run --deadline=10m $(SOURCE_PATHS) --fix
71+
$(GOLINTER) run --timeout=10m $(SOURCE_PATHS) --fix
7272

7373
doc: ## Start the documentation server with godoc
7474
@which godoc > /dev/null || (echo "Installing godoc@latest ..."; go install golang.org/x/tools/cmd/godoc@latest && echo -e "Installation complete!\n")
@@ -99,7 +99,7 @@ build-local-darwin: show-portal-status $(BUILD_PORTAL) ## Build kusion tool chai
9999
build-local-darwin-all: build-local-darwin ## Build kusion for macOS
100100
# Copy docs
101101
cp -r ./docs ./_build/bundles/kusion-darwin/docs
102-
102+
103103
# README.md
104104
cp ./README.md ./_build/bundles/kusion-darwin
105105
# Build tgz
@@ -168,7 +168,7 @@ build-local-windows: show-portal-status $(BUILD_PORTAL) ## Build kusion tool cha
168168
-rm -rf ./_build/bundles/kusion-windows
169169
mkdir -p ./_build/bundles/kusion-windows/bin
170170
mkdir -p ./_build/bundles/kusion-windows/kclvm/bin
171-
171+
172172
# Update version
173173
go generate ./pkg/version
174174

0 commit comments

Comments
 (0)