finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Makefile cleanup & double golangci-lint timeout (#14044)

Browse source 
* Makefile cleanup

The xmldom dependency is no longer required since #13680. Also,
whitespace cleanup.

* double the golangci-lint timeout
This commit is contained in:
silverwind 2020-12-17 23:55:52 +01:00 committed by GitHub
parent f8a668ab0c
commit e9cc613c24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -1,4 +1,3 @@
ifeq ($(USE_REPO_TEST_DIR),1) ifeq ($(USE_REPO_TEST_DIR),1)
# This rule replaces the whole Makefile when we're trying to use /tmp repository temporary files # This rule replaces the whole Makefile when we're trying to use /tmp repository temporary files
@ -697,10 +696,9 @@ generate-license:
generate-gitignore: generate-gitignore:
GO111MODULE=on $(GO) run build/generate-gitignores.go GO111MODULE=on $(GO) run build/generate-gitignores.go
.PHONY: generate-images .PHONY: generate-images
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 node build/generate-images.js
.PHONY: pr\#% .PHONY: pr\#%
@ -713,7 +711,7 @@ golangci-lint:
export BINARY="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; \ curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(GOPATH)/bin v1.31.0; \
fi fi
golangci-lint run --timeout 5m golangci-lint run --timeout 10m
.PHONY: docker .PHONY: docker
docker: docker: