Merge pull request #219 from uber/fix_travis_versions

Change travis versions
uber · Jun 14, 2018 · 4d64383 · 4d64383
2 parents 7288172 + c45dfed
commit 4d64383
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: go
 go:
-  - 1.7.x
-  - 1.8.x
+  - stable
 
 addons:
   apt:

diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@ export PATH := $(GOPATH)/bin:$(PATH)
 
 
 # Automatically gather packages
-PKGS = $(shell find . -type d -maxdepth 3 \
+PKGS = $(shell find . -maxdepth 3 -type d \
 	! -path '*/.git*' \
 	! -path '*/_*' \
 	! -path '*/vendor*' \
@@ -55,7 +55,7 @@ dev_deps:
 	./scripts/go-get-version.sh github.com/vektra/mockery/.../@130a05e
 
 setup: dev_deps
-	glide install --cache
+	glide install
 	@if ! which thrift | grep -q /; then \
 		echo "thrift not in PATH. (brew install thrift?)" >&2; \
  		exit 1; \

diff --git a/ringpop.go b/ringpop.go
@@ -229,7 +229,7 @@ func (rp *Ringpop) startTimers() {
 		ticker := rp.clock.Ticker(rp.config.MembershipChecksumStatPeriod)
 		rp.tickers <- ticker
 		go func() {
-			for _ = range ticker.C {
+			for range ticker.C {
 				rp.statter.UpdateGauge(
 					rp.getStatKey("membership.checksum-periodic"),
 					nil,
@@ -243,7 +243,7 @@ func (rp *Ringpop) startTimers() {
 		ticker := rp.clock.Ticker(rp.config.RingChecksumStatPeriod)
 		rp.tickers <- ticker
 		go func() {
-			for _ = range ticker.C {
+			for range ticker.C {
 				rp.statter.UpdateGauge(
 					rp.getStatKey("ring.checksum-periodic"),
 					nil,