[Amir/Jenson] trying to fix travis failure by skipping generate as go…

… file generated is already checked in code
gopaytech · Nov 8, 2018 · cdd7541 · cdd7541
1 parent d851989
commit cdd7541
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 25 deletions.
diff --git a/Makefile b/Makefile
@@ -13,16 +13,17 @@ update-deps:
 	glide update
 
 generate:
-	go-bindata -pkg config -o config/data.go data/config_template.yaml
+	go get github.com/go-bindata/go-bindata
+	$(GOPATH)/bin/go-bindata -pkg config -o config/data.go data/config_template.yaml
 
-compile: generate
+compile:
 	mkdir -p out/
 	go build -race $(GLIDE_NOVENDOR)
 
-ci.test: build-deps generate
+ci.test: build-deps
 	ENVIRONMENT=test go test $(shell glide novendor | grep -v proctord) -v
 
-test: generate
+test:
 	ENVIRONMENT=test go test $(shell glide novendor | grep -v proctord)
 
 build: build-deps compile fmt vet lint

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -15,6 +15,4 @@ import:
 - package: github.com/spf13/cobra
   version: v0.0.1
 - package: github.com/thingful/httpmock
-  version: 0.0.2
-- package: github.com/go-bindata/go-bindata
-  version: v1.0.0
+  version: 0.0.2