Updates for travis-ci

conortm · Jan 7, 2016 · 5473d3e · 5473d3e
1 parent 34bd801
commit 5473d3e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,14 +4,14 @@ go:
   - 1.4.2
   - 1.5
   - tip
-before_install:
-  - go get github.com/axw/gocov/gocov
-  - go get github.com/mattn/goveralls
-  - if ! go get code.google.com/p/go.tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi
 install:
   - make install
+before_script:
+  - go get github.com/axw/gocov/gocov
+  - go get github.com/mattn/goveralls
+  - if ! go get github.com/golang/tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi
 script:
-  - $HOME/gopath/bin/goveralls -service=travis-ci
+  - make travis
 notifications:
   email: false
 before_deploy:

diff --git a/Makefile b/Makefile
@@ -1,7 +1,6 @@
 package = github.com/conortm/ghkeys
 
-.PHONY: install
-.PHONY: release
+.PHONY: install release test travis
 
 install:
 	go get -t -v ./...
@@ -11,3 +10,9 @@ release:
 	GOOS=linux GOARCH=amd64 go build -o release/ghkeys-linux-amd64 $(package)
 	GOOS=linux GOARCH=386 go build -o release/ghkeys-linux-386 $(package)
 	GOOS=linux GOARCH=arm go build -o release/ghkeys-linux-arm $(package)
+
+test:
+	go test
+
+travis:
+	$(HOME)/gopath/bin/goveralls -service=travis-ci