Use proper repo for gocql in glide.yaml (cadence-workflow#21)

Includes various Makefile and .travis.yml fixes so that TravisCI is passing.

.travis.yml

@@ -5,7 +5,7 @@ language: go
 directories:
     - $HOME/.glide/cache
 go:
-  - 1.7
+  - 1.8
 
 addons:
   apt:
@@ -16,7 +16,6 @@ addons:
       - python
       - python-dev
       - python-pip
-      - thrift-compiler
 
 before_install:
   - pip install --user ccm
@@ -27,8 +26,7 @@ install:
   - go get github.com/axw/gocov/gocov
   - go get github.com/mattn/goveralls
   - go get golang.org/x/tools/cmd/cover
-  - go get github.com/uber/tchannel-go/thrift/thrift-gen
-  - ccm create test -v 3.9 -n 1 -s
+  - ccm create test -v 2.2.8 -n 1 -s
   - sudo ln -sf /home/travis/.local/bin/cqlsh /usr/local/bin/cqlsh
 
 script:

Makefile

@@ -46,10 +46,18 @@ ALL_SRC := $(shell find . -name "*.go" | grep -v -e Godeps -e vendor \
 # all directories with *_test.go files in them
 TEST_DIRS := $(sort $(dir $(filter %_test.go,$(ALL_SRC))))
 
-thriftc: $(THRIFT_GEN_SRC)
+glide:
+	glide install
+
+clean_thrift:
+	rm -rf .gen
+
+thriftc: clean_thrift glide $(THRIFT_GEN_SRC)
 
 bins: thriftc
-	glide install
+	go build -i -o cadence main.go
+
+bins_nothrift: glide
 	go build -i -o cadence main.go
 
 test: bins
@@ -59,7 +67,7 @@ test: bins
 		go test -coverprofile=$@ "$$dir" | tee -a test.log; \
 	done;
 
-cover_profile: clean bins
+cover_profile: clean bins_nothrift
 	@echo Testing packages:
 	@for dir in $(TEST_DIRS); do \
 		mkdir -p $(BUILD)/"$$dir"; \
@@ -77,5 +85,4 @@ cover_ci: cover_profile
 	done
 
 clean:
-	rm -rf .gen
 	rm -rf cadence

glide.yaml

@@ -3,8 +3,8 @@ import:
 - package: github.com/uber/tchannel-go
   subpackages:
   - thrift
+  - thrift/thrift-gen
 - package: github.com/gocql/gocql
-  repo: [email protected]:odp/cherami-gocql.git
   subpackages:
   - internal/lru
   - internal/murmur