Skip to content

Commit

Permalink
Update common files (istio#19416)
Browse files Browse the repository at this point in the history
* Update common files

* Split linter
  • Loading branch information
howardjohn authored and istio-testing committed Dec 5, 2019
1 parent c1c5fd8 commit f89f055
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ ifeq ($(BUILD_WITH_CONTAINER),1)
export TARGET_OUT = /work/out/$(TARGET_OS)_$(TARGET_ARCH)
CONTAINER_CLI ?= docker
DOCKER_SOCKET_MOUNT ?= -v /var/run/docker.sock:/var/run/docker.sock
IMG ?= gcr.io/istio-testing/build-tools:master-2019-11-26T07-29-27
IMG ?= gcr.io/istio-testing/build-tools:master-2019-12-04T21-25-52
UID = $(shell id -u)
GID = `grep docker /etc/group | cut -f3 -d:`
PWD = $(shell pwd)
Expand Down
15 changes: 14 additions & 1 deletion Makefile.core.mk
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,20 @@ $(foreach bin,$(BINARIES),$(shell basename $(bin))): build

MARKDOWN_LINT_WHITELIST=localhost:8080,storage.googleapis.com/istio-artifacts/pilot/,http://ratings.default.svc.cluster.local:9080/ratings

lint: lint-go lint-python lint-copyright-banner lint-scripts lint-dockerfiles lint-markdown lint-yaml lint-licenses
# To save on memory, run for each folder
lint-go-split:
@golangci-lint run -c ./common/config/.golangci.yml ./galley/...
@golangci-lint run -c ./common/config/.golangci.yml ./istioctl/...
@golangci-lint run -c ./common/config/.golangci.yml ./mixer/...
@golangci-lint run -c ./common/config/.golangci.yml ./pilot/...
@golangci-lint run -c ./common/config/.golangci.yml ./pkg/...
@golangci-lint run -c ./common/config/.golangci.yml ./samples/...
@golangci-lint run -c ./common/config/.golangci.yml ./security/...
@golangci-lint run -c ./common/config/.golangci.yml ./sidecar-injector/...
@golangci-lint run -c ./common/config/.golangci.yml ./tests/...
@golangci-lint run -c ./common/config/.golangci.yml ./tools/...

lint: lint-go-split lint-python lint-copyright-banner lint-scripts lint-dockerfiles lint-markdown lint-yaml lint-licenses
@bin/check_helm.sh
@bin/check_samples.sh
@bin/check_dashboards.sh
Expand Down
2 changes: 1 addition & 1 deletion common/.commonfiles.sha
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b54cc652c3bc425e504d32de4080d186c83b0ef8
642e2f7c7a4672d9eaba6322e6d713b8713ce141
2 changes: 2 additions & 0 deletions common/Makefile.common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ lint-python:

lint-markdown:
@${FINDFILES} -name '*.md' -print0 | ${XARGS} mdl --ignore-front-matter --style common/config/mdl.rb

lint-links:
@${FINDFILES} -name '*.md' -print0 | ${XARGS} awesome_bot --skip-save-results --allow_ssl --allow-timeout --allow-dupe --allow-redirect --white-list ${MARKDOWN_LINT_WHITELIST}

lint-sass:
Expand Down
2 changes: 0 additions & 2 deletions common/config/.golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ linters:
- funlen
- gochecknoglobals
- gochecknoinits
- gocognit
- goconst
- gocyclo
- godox
Expand All @@ -48,7 +47,6 @@ linters:
- prealloc
- scopelint
- whitespace
- wsl
fast: false

linters-settings:
Expand Down

0 comments on commit f89f055

Please sign in to comment.