Skip to content

Makefile cleanup #14044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 17, 2020
Merged

Makefile cleanup #14044

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d92f2fc
Makefile cleanup
silverwind Dec 17, 2020
cbc762a
double the golangci-lint timeout
silverwind Dec 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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\#%
Expand All @@ -713,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:
Expand Down