fix lint and support go 1.9

TritonDataCenter · Sep 20, 2017 · 9397e9f · 9397e9f
1 parent a66e0fe
commit 9397e9f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/jobs/config.go b/jobs/config.go
@@ -127,10 +127,8 @@ func (cfg *Config) Validate(disc discovery.Backend) error {
 	if err := cfg.validateRestarts(); err != nil {
 		return err
 	}
-	if err := cfg.validateExec(); err != nil {
-		return err
-	}
-	return nil
+
+	return cfg.validateExec()
 }
 
 func (cfg *Config) setStopping(name string) {

diff --git a/makefile b/makefile
@@ -94,7 +94,7 @@ dep-add: build/containerpilot_build
 # run 'GOOS=darwin make tools' if you're installing on MacOS
 ## set up local dev environment
 tools:
-	@go version | grep 1.8 || (echo 'go1.8 should be installed')
+	@go version | grep 1.[8,9] || (echo 'go1.8 or go1.9 should be installed')
 	@$(if $(value GOPATH),, $(error 'GOPATH not set'))
 	go get github.com/golang/lint/golint
 	curl --fail -Lso glide.tgz "https://github.com/Masterminds/glide/releases/download/v0.12.3/glide-v0.12.3-$(GOOS)-$(GOARCH).tar.gz"