diff --git a/.travis.yml b/.travis.yml index 7c706505..304d3db7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,14 @@ language: go go: - - 1.11.x + # test with the two most recent Go versions - 1.12.x - 1.13.x env: - - NSQ_DOWNLOAD=nsq-0.3.8.linux-amd64.go1.6.2 GOARCH=amd64 - - NSQ_DOWNLOAD=nsq-0.3.8.linux-amd64.go1.6.2 GOARCH=386 - NSQ_DOWNLOAD=nsq-1.0.0-compat.linux-amd64.go1.8 GOARCH=amd64 - - NSQ_DOWNLOAD=nsq-1.0.0-compat.linux-amd64.go1.8 GOARCH=386 - NSQ_DOWNLOAD=nsq-1.1.0.linux-amd64.go1.10.3 GOARCH=amd64 - - NSQ_DOWNLOAD=nsq-1.1.0.linux-amd64.go1.10.3 GOARCH=386 + - NSQ_DOWNLOAD=nsq-1.2.0.linux-amd64.go1.12.9 GOARCH=amd64 + # test most recent nsq version on GOARCH=386 + - NSQ_DOWNLOAD=nsq-1.2.0.linux-amd64.go1.12.9 GOARCH=386 script: - ./travis.sh notifications: diff --git a/Gopkg.lock b/Gopkg.lock deleted file mode 100644 index 361eabd1..00000000 --- a/Gopkg.lock +++ /dev/null @@ -1,16 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - digest = "1:6a6322a15aa8e99bd156fbba0aae4e5d67b4bb05251d860b348a45dfdcba9cce" - name = "github.com/golang/snappy" - packages = ["."] - pruneopts = "" - revision = "v0.0.1" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - input-imports = ["github.com/golang/snappy"] - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml deleted file mode 100644 index 84f43019..00000000 --- a/Gopkg.toml +++ /dev/null @@ -1,26 +0,0 @@ - -# Gopkg.toml example -# -# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md -# for detailed Gopkg.toml documentation. -# -# required = ["github.com/user/thing/cmd/thing"] -# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] -# -# [[constraint]] -# name = "github.com/user/project" -# version = "1.0.0" -# -# [[constraint]] -# name = "github.com/user/project2" -# branch = "dev" -# source = "github.com/myfork/project2" -# -# [[override]] -# name = "github.com/x/y" -# version = "2.4.0" - - -[[constraint]] - name = "github.com/golang/snappy" - revision = "v0.0.1" diff --git a/go.sum b/go.sum index 66196a3a..331e6a1a 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,2 @@ -github.com/golang/snappy v0.0.0-20160529050041-d9eb7a3d35ec h1:ZaSUjYC8aWT/om43c8YVz0SqjT8ABtqw7REbZGsCroE= -github.com/golang/snappy v0.0.0-20160529050041-d9eb7a3d35ec/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= diff --git a/travis.sh b/travis.sh index bb8b999c..ead70a08 100755 --- a/travis.sh +++ b/travis.sh @@ -6,13 +6,5 @@ wget http://bitly-downloads.s3.amazonaws.com/nsq/$NSQ_DOWNLOAD.tar.gz tar zxvf $NSQ_DOWNLOAD.tar.gz export PATH=$NSQ_DOWNLOAD/bin:$PATH -go_minor_version=$(go version | awk '{print $3}' | awk -F. '{print $2}') -if [[ $go_minor_version -gt 10 ]]; then - export GO111MODULE=on -else - wget -O dep https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64 - chmod +x dep - ./dep ensure -fi - +export GO111MODULE=on ./test.sh diff --git a/version.go b/version.go index 7729346c..21a840d2 100644 --- a/version.go +++ b/version.go @@ -1,4 +1,4 @@ package nsq // VERSION -const VERSION = "1.0.7" +const VERSION = "1.0.8"