Merge pull request #37 from wallyqs/vendor-deps

Vendor deps, bump Golang versions
nats-io · Aug 18, 2016 · 9349a59 · 9349a59
2 parents 494b6b3 + 7c45b56
commit 9349a59
Show file tree

Hide file tree

Showing 139 changed files with 23,379 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,27 +1,21 @@
 language: go
 
 go:
-  - 1.6
+  - 1.6.3
+  - 1.7
   - tip
 
 env:
   global:
     - BUILD_GOARCH=amd64
   matrix:
     - BUILD_GOOS=linux
-
-install:
-  - go get github.com/nats-io/gnatsd
-  - go get gopkg.in/gizak/termui.v1
-  - go get golang.org/x/crypto/bcrypt
+  allow_failures:
+    - go: tip
 
 script:
-  - go get -d -v ./...
-  - go build -v ./...
   - go fmt ./...
-  - go vet ./...
-  - go test -i -race ./...
-  - go test -v -race ./...
+  - go test -v -race ./util/
 
 after_success:
-  - if [ "$TRAVIS_GO_VERSION" = "1.5" ] && [ "$BUILD_GOOS" = "linux" ] && [ "$TRAVIS_TAG" != "" ]; then ./scripts/cross_compile.sh; ghr --username wallyqs --token $GITHUB_TOKEN --replace --debug $TRAVIS_TAG pkg/ ; fi
+  - if [ "$TRAVIS_GO_VERSION" = "1.6" ] && [ "$BUILD_GOOS" = "linux" ] && [ "$TRAVIS_TAG" != "" ]; then ./scripts/cross_compile.sh; ghr --username wallyqs --token $GITHUB_TOKEN --replace --debug $TRAVIS_TAG pkg/ ; fi
diff --git a/Makefile b/Makefile
@@ -0,0 +1,4 @@
+
+
+all:
+	go build nats-top.go
diff --git a/nats-top.go b/nats-top.go
@@ -14,7 +14,7 @@ import (
 	ui "gopkg.in/gizak/termui.v1"
 )
 
-const version = "0.2.0"
+const version = "0.3.0"
 
 var (
 	host        = flag.String("s", "127.0.0.1", "The nats server host.")

diff --git a/vendor/github.com/gizak/termui/LICENSE b/vendor/github.com/gizak/termui/LICENSE
diff --git a/vendor/github.com/gizak/termui/barchart.go b/vendor/github.com/gizak/termui/barchart.go