Skip to content

Commit

Permalink
Merge pull request #780 from cyrilleverrier/master
Browse files Browse the repository at this point in the history
Fix #779: libbeat/Makefile filters vendor folder
  • Loading branch information
ruflin committed Jan 20, 2016
2 parents e2169fb + 72eb572 commit f36219a
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions libbeat/scripts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ ARCH?=$(shell uname -m)
export PATH := ./bin:$(PATH)
export GO15VENDOREXPERIMENT=1
GOFILES = $(shell find . -type f -name '*.go')
GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "./vendor/*")
SHELL=/bin/bash
ES_HOST?="elasticsearch"
BUILD_DIR?=build
Expand Down Expand Up @@ -63,20 +64,20 @@ crosscompile: $(GOFILES)
# Checks project and source code if everything is according to standard
.PHONY: check
check:
@gofmt -l . | read && echo "Code differs from gofmt's style" 1>&2 && exit 1 || true
go vet ./...
@gofmt -l ${GOFILES_NOVENDOR} | read && echo "Code differs from gofmt's style" 1>&2 && exit 1 || true
go vet ${GOPACKAGES}

# Runs gofmt -w on the project's source code, modifying any files that do not
# match its style.
.PHONY: fmt
fmt:
gofmt -l -w .
gofmt -l -w ${GOFILES_NOVENDOR}

# Runs gofmt -s -w on the project's source code, modifying any files that do not
# match its style.
.PHONY: simplify
simplify:
gofmt -l -s -w .
gofmt -l -s -w ${GOFILES_NOVENDOR}

# Cleans up directory and source code with gofmt
.PHONY: clean
Expand Down

0 comments on commit f36219a

Please sign in to comment.