diff --git a/.travis.yml b/.travis.yml index 2afc218b1..42a6dc804 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,6 @@ language: go go: # test with the two most recent Go versions - # and with the minimum supported Go version - - 1.9.x - 1.12.x - 1.13.x env: diff --git a/Gopkg.lock b/Gopkg.lock deleted file mode 100644 index 2cfe13d56..000000000 --- a/Gopkg.lock +++ /dev/null @@ -1,109 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - digest = "1:e4b30804a381d7603b8a344009987c1ba351c26043501b23b8c7ce21f0b67474" - name = "github.com/BurntSushi/toml" - packages = ["."] - pruneopts = "" - revision = "v0.3.1" - -[[projects]] - digest = "1:90899f76443f9a7f6de1547f1e713951c383cca970eeff5bc7bff3607fc1a48c" - name = "github.com/bitly/go-hostpool" - packages = ["."] - pruneopts = "" - revision = "a3a6125de932" - -[[projects]] - digest = "1:9e409df6d0c9b8707e5bcaa6e2a0d99c145f14db7759455ac99170a019757ae7" - name = "github.com/bitly/timer_metrics" - packages = ["."] - pruneopts = "" - revision = "b1c65ca7ae62" - -[[projects]] - digest = "1:79421244ba5848aae4b0a5c41e633a04e4894cb0b164a219dc8c15ec7facb7f1" - name = "github.com/blang/semver" - packages = ["."] - pruneopts = "" - revision = "v3.5.1" - -[[projects]] - digest = "1:0f41c61095048870d68c6e932130b028323e7d65e69f1be57536181fed983c6f" - name = "github.com/bmizerany/perks" - packages = ["quantile"] - pruneopts = "" - revision = "d9a9656a3a4b" - -[[projects]] - digest = "1:2a5888946cdbc8aa360fd43301f9fc7869d663f60d5eedae7d4e6e5e4f06f2bf" - name = "github.com/golang/snappy" - packages = ["."] - pruneopts = "" - revision = "2e65f85255db" - -[[projects]] - digest = "1:588fccacebfd731e835e3f8f5adb848535f9aa57def5465f19a69a07354598d6" - name = "github.com/judwhite/go-svc" - packages = ["svc"] - pruneopts = "" - revision = "v1.0.0" - -[[projects]] - digest = "1:deeb6536ebbcb66ab11213ecfaac9daadfcd004dd057446a4980ffd6c15c36e2" - name = "github.com/julienschmidt/httprouter" - packages = ["."] - pruneopts = "" - revision = "v1.2.0" - -[[projects]] - digest = "1:15c0562bca5d78ac087fb39c211071dc124e79fb18f8b7c3f8a0bc7ffcb2a38e" - name = "github.com/mreiferson/go-options" - packages = ["."] - pruneopts = "" - revision = "0c63f026bcd6" - -[[projects]] - digest = "1:f4f17bf49baf6cf0c3ba00ee2893a4c673b81fd227524956bc7c9fd64f58b133" - name = "github.com/nsqio/go-diskqueue" - packages = ["."] - pruneopts = "" - revision = "8c228d7a2450265de03e1d42e21f59e23d6339c6" - -[[projects]] - digest = "1:7a69f6a3a33929f8b66aa39c93868ad1698f06417fe627ae067559beb94504bd" - name = "github.com/nsqio/go-nsq" - packages = ["."] - pruneopts = "" - revision = "v1.0.7" - -[[projects]] - branch = "master" - digest = "1:e6d1805ead5b8f2439808f76187f54042ed35ee26eb9ca63127259a0e612b119" - name = "golang.org/x/sys" - packages = [ - "windows", - "windows/svc", - ] - pruneopts = "" - revision = "b4a75ba826a64a70990f11a225237acd6ef35c9f" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - input-imports = [ - "github.com/BurntSushi/toml", - "github.com/bitly/go-hostpool", - "github.com/bitly/timer_metrics", - "github.com/blang/semver", - "github.com/bmizerany/perks/quantile", - "github.com/golang/snappy", - "github.com/judwhite/go-svc/svc", - "github.com/julienschmidt/httprouter", - "github.com/mreiferson/go-options", - "github.com/nsqio/go-diskqueue", - "github.com/nsqio/go-nsq", - ] - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml deleted file mode 100644 index fa7048d72..000000000 --- a/Gopkg.toml +++ /dev/null @@ -1,66 +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/BurntSushi/toml" - revision = "v0.3.1" - -[[constraint]] - name = "github.com/bitly/go-hostpool" - revision = "a3a6125de932" - -[[constraint]] - name = "github.com/bitly/timer_metrics" - revision = "b1c65ca7ae62" - -[[constraint]] - name = "github.com/blang/semver" - revision = "v3.5.1" - -[[constraint]] - name = "github.com/bmizerany/perks" - revision = "d9a9656a3a4b" - -[[constraint]] - name = "github.com/golang/snappy" - revision = "2e65f85255db" - -[[constraint]] - name = "github.com/judwhite/go-svc" - revision = "v1.0.0" - -[[constraint]] - name = "github.com/julienschmidt/httprouter" - revision = "v1.2.0" - -[[constraint]] - name = "github.com/mreiferson/go-options" - revision = "0c63f026bcd6" - -[[constraint]] - name = "github.com/nsqio/go-diskqueue" - revision = "8c228d7a2450265de03e1d42e21f59e23d6339c6" - -[[constraint]] - name = "github.com/nsqio/go-nsq" - revision = "v1.0.7" diff --git a/dist.sh b/dist.sh index 1660de575..65810b983 100755 --- a/dist.sh +++ b/dist.sh @@ -26,11 +26,12 @@ goversion=$(go version | awk '{print $3}') echo "... running tests" ./test.sh +export GO111MODULE=on for os in linux darwin freebsd windows; do echo "... building v$version for $os/$arch" BUILD=$(mktemp -d ${TMPDIR:-/tmp}/nsq-XXXXX) TARGET="nsq-$version.$os-$arch.$goversion" - GO111MODULE=on GOOS=$os GOARCH=$arch CGO_ENABLED=0 \ + GOOS=$os GOARCH=$arch CGO_ENABLED=0 \ make DESTDIR=$BUILD PREFIX=/$TARGET BLDFLAGS="$GOFLAGS" install pushd $BUILD sudo chown -R 0:0 $TARGET diff --git a/go.mod b/go.mod index 618f0235e..d138e7c12 100644 --- a/go.mod +++ b/go.mod @@ -2,18 +2,18 @@ module github.com/nsqio/nsq require ( github.com/BurntSushi/toml v0.3.1 - github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932 - github.com/bitly/timer_metrics v0.0.0-20170606164300-b1c65ca7ae62 + github.com/bitly/go-hostpool v0.1.0 + github.com/bitly/timer_metrics v1.0.0 github.com/blang/semver v3.5.1+incompatible github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b github.com/davecgh/go-spew v1.1.1 // indirect - github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db - github.com/judwhite/go-svc v1.0.0 - github.com/julienschmidt/httprouter v1.2.0 - github.com/mreiferson/go-options v0.0.0-20190302015348-0c63f026bcd6 - github.com/nsqio/go-diskqueue v0.0.0-20191213054144-8c228d7a2450 - github.com/nsqio/go-nsq v1.0.7 - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/stretchr/testify v1.2.2 // indirect - golang.org/x/sys v0.0.0-20181221143128-b4a75ba826a6 // indirect + github.com/golang/snappy v0.0.1 + github.com/judwhite/go-svc v1.1.2 + github.com/julienschmidt/httprouter v1.3.0 + github.com/mreiferson/go-options v1.0.0 + github.com/nsqio/go-diskqueue v1.0.0 + github.com/nsqio/go-nsq v1.0.8 + golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 // indirect ) + +go 1.13 diff --git a/go.sum b/go.sum index 181b02b0d..ee27b8b10 100644 --- a/go.sum +++ b/go.sum @@ -1,30 +1,36 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932 h1:mXoPYz/Ul5HYEDvkta6I8/rnYM5gSdSV2tJ6XbZuEtY= -github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k= -github.com/bitly/timer_metrics v0.0.0-20170606164300-b1c65ca7ae62 h1:XweEvNzrfQJdCmTP7Uo8LQP6P5cwQWwqvXobrZQcW0M= -github.com/bitly/timer_metrics v0.0.0-20170606164300-b1c65ca7ae62/go.mod h1:EJqiy/5FjJk5tEOxXhnxvFijOmeB5ka1D2fvqHOXUXA= +github.com/bitly/go-hostpool v0.1.0 h1:XKmsF6k5el6xHG3WPJ8U0Ku/ye7njX7W81Ng7O2ioR0= +github.com/bitly/go-hostpool v0.1.0/go.mod h1:4gOCgp6+NZnVqlKyZ/iBZFTAJKembaVENUpMkpg42fw= +github.com/bitly/timer_metrics v1.0.0 h1:bbszVIl0vT5+/cdZx8L4KOQmM8mC/0y3EBICGSxyhCk= +github.com/bitly/timer_metrics v1.0.0/go.mod h1:87z4/LSg3f++tMqZwZlsLwPuJu6xloyJ7Qm40NyEkLs= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b h1:AP/Y7sqYicnjGDfD5VcY4CIfh1hRXBUavxrvELjTiOE= github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b/go.mod h1:ac9efd0D1fsDb3EJvhqgXRbFx7bs2wqZ10HQPeU8U/Q= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w= -github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/judwhite/go-svc v1.0.0 h1:W447kYhZsqC14hkfNG8XLy9wbYibeMW75g5DtAIpFGw= -github.com/judwhite/go-svc v1.0.0/go.mod h1:EeMSAFO3mLgEQfcvnZ50JDG0O1uQlagpAbMS6talrXE= -github.com/julienschmidt/httprouter v1.2.0 h1:TDTW5Yz1mjftljbcKqRcrYhd4XeOoI98t+9HbQbYf7g= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/mreiferson/go-options v0.0.0-20190302015348-0c63f026bcd6 h1:frRvTmIp7QT1RPaphBvr6zvEHfvdOX7jMO7rvicCH9Q= -github.com/mreiferson/go-options v0.0.0-20190302015348-0c63f026bcd6/go.mod h1:zHtCks/HQvOt8ATyfwVe3JJq2PPuImzXINPRTC03+9w= -github.com/nsqio/go-diskqueue v0.0.0-20191213054144-8c228d7a2450 h1:5kOO/fS7AISHyIRPXdCbEefNxpc4bvYzRv6xmqPT4eQ= -github.com/nsqio/go-diskqueue v0.0.0-20191213054144-8c228d7a2450/go.mod h1:AYinRDfdKMmVKTPI8wOcLgjcw2pTS3jo8fib1VxOzsE= -github.com/nsqio/go-nsq v1.0.7 h1:O0pIZJYTf+x7cZBA0UMY8WxFG79lYTURmWzAAh48ljY= -github.com/nsqio/go-nsq v1.0.7/go.mod h1:XP5zaUs3pqf+Q71EqUJs3HYfBIqfK6G83WQMdNN+Ito= +github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= +github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/judwhite/go-svc v1.1.2 h1:wKroC8SKFs2EmtoS3XVmZinnRtGmu9qVrjubFp8talY= +github.com/judwhite/go-svc v1.1.2/go.mod h1:EeMSAFO3mLgEQfcvnZ50JDG0O1uQlagpAbMS6talrXE= +github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= +github.com/mreiferson/go-options v1.0.0 h1:RMLidydGlDWpL+lQTXo0bVIf/XT2CTq7AEJMoz5/VWs= +github.com/mreiferson/go-options v1.0.0/go.mod h1:zHtCks/HQvOt8ATyfwVe3JJq2PPuImzXINPRTC03+9w= +github.com/nsqio/go-diskqueue v1.0.0 h1:XRqpx7zTMu9yNVH+cHvA5jEiPNKoYcyEsCVqXP3eFg4= +github.com/nsqio/go-diskqueue v1.0.0/go.mod h1:INuJIxl4ayUsyoNtHL5+9MFPDfSZ0zY93hNY6vhBRsI= +github.com/nsqio/go-nsq v1.0.8 h1:3L2F8tNLlwXXlp2slDUrUWSBn2O3nMh8R1/KEDFTHPk= +github.com/nsqio/go-nsq v1.0.8/go.mod h1:vKq36oyeVXgsS5Q8YEO7WghqidAVXQlcFxzQbQTuDEY= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -golang.org/x/sys v0.0.0-20181221143128-b4a75ba826a6 h1:IcgEB62HYgAhX0Nd/QrVgZlxlcyxbGQHElLUhW2X4Fo= -golang.org/x/sys v0.0.0-20181221143128-b4a75ba826a6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 h1:Dho5nD6R3PcW2SH1or8vS0dszDaXRxIw55lBX7XiE5g= +golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/test.sh b/test.sh index 6d420202e..d88b4d6aa 100755 --- a/test.sh +++ b/test.sh @@ -1,8 +1,9 @@ #!/bin/sh set -e -GOMAXPROCS=1 go test -timeout 90s $(go list ./... | grep -v /vendor/) -GOMAXPROCS=4 go test -timeout 90s -race $(go list ./... | grep -v /vendor/) +export GO111MODULE=on +GOMAXPROCS=1 go test -timeout 90s ./... +GOMAXPROCS=4 go test -timeout 90s -race ./... # no tests, but a build is something for dir in apps/*/ bench/*/; do