Skip to content

Commit

Permalink
Simplify
Browse files Browse the repository at this point in the history
Signed-off-by: Tom Wilkie <[email protected]>
  • Loading branch information
tomwilkie committed Oct 13, 2020
1 parent e75b06f commit 9229934
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,18 @@

JSONNET_FMT := jsonnetfmt

lint:
lint: lint-mixin
@RESULT=0; \
for f in $$(find . -name '*.libsonnet' -print -o -name '*.jsonnet' -print); do \
$(JSONNET_FMT) -- "$$f" | diff -u "$$f" -; \
RESULT=$$(($$RESULT + $$?)); \
done; \
pushd cortex-mixin >/dev/null && jb install && popd >/dev/null; \
mixtool lint -J cortex-mixin/vendor cortex-mixin/mixin.libsonnet; \
RESULT=$$(($$RESULT + $$?)); \
exit $$RESULT

lint-mixin:
cd cortex-mixin && \
jb install && \
mixtool lint mixin.libsonnet

fmt:
@find . -name 'vendor' -prune -o -name '*.libsonnet' -print -o -name '*.jsonnet' -print | \
Expand Down

0 comments on commit 9229934

Please sign in to comment.