From d68dd39839482ce754cc082b0371fe5f3b42d234 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Wed, 27 May 2015 17:22:56 +0100 Subject: [PATCH 1/2] build all exes --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 44aff575..74db14ce 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ DOCKER_DISTRIB_URL=https://get.docker.com/builds/Linux/x86_64/docker-$(WEAVEEXEC all: $(WEAVER_EXPORT) $(WEAVEDNS_EXPORT) $(WEAVEEXEC_EXPORT) -travis: $(WEAVER_EXE) $(WEAVEDNS_EXE) +travis: $(WEAVER_EXE) $(WEAVEDNS_EXE) $(SIGPROXY_EXE) $(WEAVEPROXY_EXE) $(WEAVEWAIT_EXE) update: go get -u -f -v -tags -netgo ./$(dir $(WEAVER_EXE)) ./$(dir $(WEAVEDNS_EXE)) ./$(dir $(SIGPROXY_EXE)) ./$(dir $(WEAVEPROXY_EXE)) From 4dc2ee034c3153d525225ea737493dc5b16ff9bb Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Wed, 27 May 2015 17:23:15 +0100 Subject: [PATCH 2/2] run linter on travis --- .travis.yml | 1 + bin/lint | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bb7047c6..76176d74 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ addons: install: - go clean -i net - go install -tags netgo std + - go get github.com/golang/lint/golint - pip install --user --upgrade gcloud gsutil - bin/setup-ci-secrets $encrypted_5ba036e89377_key $encrypted_5ba036e89377_iv - make travis diff --git a/bin/lint b/bin/lint index 78b9f6a5..4e50906c 100755 --- a/bin/lint +++ b/bin/lint @@ -28,7 +28,7 @@ function lint_go { # don't have it installed. if type golint >/dev/null 2>&1; then # golint doesn't set an exit code it seems - lintoutput=$(golint "${filename}") + lintoutput=$(golint "${filename}" | grep -vE 'comment|dot imports') if [ "$lintoutput" != "" ]; then result=1 echo "$lintoutput"