From d92f2fc88fc0c09d7579556bdbe102ac46ddb1c0 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 17 Dec 2020 22:36:46 +0100 Subject: [PATCH 1/2] Makefile cleanup The xmldom dependency is no longer required since #13680. Also, whitespace cleanup. --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index fe26a413bd082..94c7881c90522 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,3 @@ - ifeq ($(USE_REPO_TEST_DIR),1) # This rule replaces the whole Makefile when we're trying to use /tmp repository temporary files @@ -697,10 +696,9 @@ generate-license: generate-gitignore: GO111MODULE=on $(GO) run build/generate-gitignores.go - .PHONY: generate-images generate-images: - npm install --no-save --no-package-lock xmldom fabric imagemin-zopfli + npm install --no-save --no-package-lock fabric imagemin-zopfli node build/generate-images.js .PHONY: pr\#% From cbc762ada7e5ff0a82dbdec3f4d241c5d004faaa Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 17 Dec 2020 23:03:27 +0100 Subject: [PATCH 2/2] double the golangci-lint timeout --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 94c7881c90522..bb2f181d290db 100644 --- a/Makefile +++ b/Makefile @@ -711,7 +711,7 @@ golangci-lint: export BINARY="golangci-lint"; \ curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(GOPATH)/bin v1.31.0; \ fi - golangci-lint run --timeout 5m + golangci-lint run --timeout 10m .PHONY: docker docker: