From c349d6dcf74923eba4d153bde46ba7ad4d83329d Mon Sep 17 00:00:00 2001 From: Andrew Gillis Date: Mon, 20 May 2019 17:53:02 -0400 Subject: [PATCH 1/3] Update dependencies --- .travis.yml | 7 +++++-- Makefile | 8 ++++++-- go.mod | 7 +++++-- go.sum | 19 +++++++++++++------ 4 files changed, 29 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 86218b90..b8d64823 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,9 @@ language: go go: - - "1.11" - - "1.12" + - 1.11.x + - 1.12.x + - master env: global: @@ -11,6 +12,8 @@ env: before_script: - go get - go vet -all -composites=false ./... + - go install golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow + - go vet -vettool=${GOPATH}/bin/shadow ./... script: - go build ./examples/... diff --git a/Makefile b/Makefile index 2e42952b..ab9ba971 100644 --- a/Makefile +++ b/Makefile @@ -4,8 +4,12 @@ SERVICE_DIR = nexusd all: vet test service -vet: - go vet -all -composites=false -shadow=true ./... +$(GOPATH)/bin/shadow: + go install golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow + +vet: $(GOPATH)/bin/shadow + go vet -all -composites=false ./... + go vet -vettool=$(GOPATH)/bin/shadow ./... test: go get github.com/fortytw2/leaktest diff --git a/go.mod b/go.mod index 954e280c..3b43231b 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,12 @@ module github.com/gammazero/nexus +go 1.12 + require ( github.com/davecgh/go-spew v1.1.1 github.com/fortytw2/leaktest v1.3.0 - github.com/gorilla/websocket v0.0.0-20181030144553-483fb8d7c32f + github.com/gorilla/websocket v1.4.0 github.com/ugorji/go v1.1.4 - golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd + golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f + golang.org/x/tools v0.0.0-20190520200954-7e7c6e521403 // indirect ) diff --git a/go.sum b/go.sum index aa7176fb..f9ff49b7 100644 --- a/go.sum +++ b/go.sum @@ -2,11 +2,18 @@ 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/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= -github.com/gorilla/websocket v0.0.0-20181030144553-483fb8d7c32f h1:a3AO62p4QxRNbwMYvioUwy8S+pA0LD6t6gJlyJoXUcc= -github.com/gorilla/websocket v0.0.0-20181030144553-483fb8d7c32f/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/ugorji/go v0.0.0-20181022190402-e5e69e061d4f h1:LYZasnCL6dazS0SpVfPGMXEGpwE+XloUlzl6sItzPT0= -github.com/ugorji/go v0.0.0-20181022190402-e5e69e061d4f/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ= +github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/ugorji/go v1.1.4 h1:j4s+tAvLfL3bZyefP2SEWmhBzmuIlH/eqNuPdFPgngw= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= -golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd h1:VtIkGDhk0ph3t+THbvXHfMZ8QHgsBO39Nh52+74pq7w= -golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f h1:R423Cnkcp5JABoeemiGEPlt9tHXFfw5kvc0yqlxRPWo= +golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/tools v0.0.0-20190520200954-7e7c6e521403 h1:LkLPH7H115t/Cjvl2cV2VNZYdWWKt22DucZfiEgZ83o= +golang.org/x/tools v0.0.0-20190520200954-7e7c6e521403/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= From eea3e1f8598f8755d30eb7f2ac6ab20e3ad582f8 Mon Sep 17 00:00:00 2001 From: Andrew Gillis Date: Mon, 20 May 2019 18:27:40 -0400 Subject: [PATCH 2/3] Let travis-ci use Makefile --- .travis.yml | 18 ------------------ Makefile | 5 +++-- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index b8d64823..cc7084a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,21 +8,3 @@ go: env: global: - GO111MODULE=on - -before_script: - - go get - - go vet -all -composites=false ./... - - go install golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow - - go vet -vettool=${GOPATH}/bin/shadow ./... - -script: - - go build ./examples/... - - go test ./nexusd/... - - go test -v -race ./wamp/... - - go test -v -race ./transport/... - - go test -v -race ./router/... - - go test -v -race ./client/... - - go test -v -race ./aat/... - - go test -v -race ./aat -scheme=ws -compress - - go test -v ./aat -scheme=wss -serialize=msgpack - - go test -v ./aat -scheme=tcps diff --git a/Makefile b/Makefile index ab9ba971..c75ca14b 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ test: go test -race ./aat -scheme=unix go test ./aat -scheme=ws -serialize=msgpack go test ./aat -scheme=tcp -serialize=msgpack - go test ./aat -scheme=ws -serialize=cbor + go test ./aat -scheme=ws -serialize=cbor -compress go test ./aat -scheme=tcp -serialize=cbor go test ./aat -scheme=wss go test ./aat -scheme=tcps @@ -46,4 +46,5 @@ $(SERVICE_DIR)/nexusd: clean: @rm -f $(SERVICE_DIR)/nexusd @rm -f $(SERVICE_DIR)/*.log - @GO111MODULE=off go clean + @GO111MODULE=off go clean ./... + @GO111MODULE=off go clean -cache From 8f62f6b3bfa88f082832cdb0c56e0f2443e3d548 Mon Sep 17 00:00:00 2001 From: Andrew Gillis Date: Mon, 20 May 2019 20:44:15 -0400 Subject: [PATCH 3/3] only test up to latest stable go --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cc7084a8..741e7cdc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ language: go go: - 1.11.x - 1.12.x - - master env: global: