Skip to content

Commit

Permalink
Upgrade to go v1.11 & go modules (#12)
Browse files Browse the repository at this point in the history
  • Loading branch information
Prutswonder authored Oct 29, 2018
1 parent 43cd1f2 commit b716711
Show file tree
Hide file tree
Showing 6 changed files with 72 additions and 229 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: go

go:
- 1.9.x
- 1.11.x

script:
- 'make cover-remote'
Expand Down
168 changes: 0 additions & 168 deletions Gopkg.lock

This file was deleted.

50 changes: 0 additions & 50 deletions Gopkg.toml

This file was deleted.

23 changes: 13 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
COVERALLS_TOKEN := "IVQwNa8dypGgtaLmBkFSoBcRcCl0tlqui"
GITHUB_API_TOKEN := ""
VERSION :=""
APP_NAME := "servicefoundation"
SERVER_NAME := "servicefoundation-1234"
DEPLOY_ENVIRONMENT := "staging"

export GO111MODULE=on
export APP_NAME=servicefoundation
export SERVER_NAME=servicefoundation-1234
export DEPLOY_ENVIRONMENT=staging

cover-remote:
go get -u golang.org/x/lint/golint
go get -u github.com/mattn/goveralls
go get -u github.com/golang/dep/cmd/dep
dep ensure
go test -covermode=count -coverprofile=cover.tmp
goveralls -service travis-ci -coverprofile cover.tmp

run-tests:
go get -u github.com/golang/dep/cmd/dep
dep ensure
go test -cover `go list ./... | grep -v /vendor/`
go test -race -cover -v `go list ./... | grep -v /vendor/`

cover:
go test -cover `go list ./... | grep -v /vendor/`
Expand All @@ -27,6 +25,11 @@ lint:
vet:
go vet `go list ./... | grep -v /vendor/`

cover-old:
#go test -coverprofile=cover.tmp `go list ./... | grep -v /vendor/` && go tool cover -html=cover.tmp `go list ./... | grep -v /vendor/`
clean:
go clean

upgrade:
go get -u

env:
go env
22 changes: 22 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
module github.com/Travix-International/go-servicefoundation

require (
github.com/Travix-International/go-metrics v1.5.1
github.com/Travix-International/logger v0.6.0
github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a // indirect
github.com/davecgh/go-spew v1.1.0 // indirect
github.com/golang/protobuf v0.0.0-20171113180720-1e59b77b52bf // indirect
github.com/julienschmidt/httprouter v1.1.0
github.com/matttproud/golang_protobuf_extensions v1.0.0 // indirect
github.com/pkg/errors v0.8.0
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v0.8.0
github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5 // indirect
github.com/prometheus/common v0.0.0-20171117163051-2e54d0b93cba // indirect
github.com/prometheus/procfs v0.0.0-20171216224917-f98634e40885 // indirect
github.com/rs/cors v0.0.0-20170727213201-7af7a1e09ba3
github.com/stretchr/objx v0.0.0-20150928122152-1a9d0bb9f541 // indirect
github.com/stretchr/testify v1.1.4
golang.org/x/net v0.0.0-20171212005608-d866cfc389ce
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f // indirect
)
36 changes: 36 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
github.com/Travix-International/go-metrics v1.5.1 h1:vk0tr5d7MlNlIBI8rfAO3+Z/nucrBF93ua83UsvxA5s=
github.com/Travix-International/go-metrics v1.5.1/go.mod h1:lbRlN6gytDilG5VsVrORpENEWrjHr4Xd8Jm4E4ebpZA=
github.com/Travix-International/logger v0.6.0 h1:d6FK2JwIoM8mLE+F7gVuuDH/RSSz7e19OjjgXmzCNvI=
github.com/Travix-International/logger v0.6.0/go.mod h1:148BLLMpf0IwDjf96U7r4tIYo+CpQSwc6S2D8LWHRZY=
github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a h1:BtpsbiV638WQZwhA98cEZw2BsbnQJrbd0BI7tsy0W1c=
github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/golang/protobuf v0.0.0-20171113180720-1e59b77b52bf h1:pFr/u+m8QUBMW/itAczltF3guNRAL7XDs5tD3f6nSD0=
github.com/golang/protobuf v0.0.0-20171113180720-1e59b77b52bf/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/julienschmidt/httprouter v1.1.0 h1:7wLdtIiIpzOkC9u6sXOozpBauPdskj3ru4EI5MABq68=
github.com/julienschmidt/httprouter v1.1.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
github.com/matttproud/golang_protobuf_extensions v1.0.0 h1:YNOwxxSJzSUARoD9KRZLzM9Y858MNGCOACTvCW9TSAc=
github.com/matttproud/golang_protobuf_extensions v1.0.0/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
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/prometheus/client_golang v0.8.0 h1:1921Yw9Gc3iSc4VQh3PIoOqgPCZS7G/4xQNVUp8Mda8=
github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5 h1:cLL6NowurKLMfCeQy4tIeph12XNQWgANCNvdyrOYKV4=
github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
github.com/prometheus/common v0.0.0-20171117163051-2e54d0b93cba h1:/MUKoJbk4oXV3uxkpfHVkmVfL+wzWW6dttaW26s07Gg=
github.com/prometheus/common v0.0.0-20171117163051-2e54d0b93cba/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
github.com/prometheus/procfs v0.0.0-20171216224917-f98634e40885 h1:jEQdQynj0YAyrzXTinwWiZyupQrhpGAmlO99z3DKBQM=
github.com/prometheus/procfs v0.0.0-20171216224917-f98634e40885/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/rs/cors v0.0.0-20170727213201-7af7a1e09ba3 h1:86ukAHRTa2CXdBnWJHcjjPPGTyLGEF488OFRsbBAuFs=
github.com/rs/cors v0.0.0-20170727213201-7af7a1e09ba3/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
github.com/stretchr/objx v0.0.0-20150928122152-1a9d0bb9f541 h1:nvL7eaZN/Zw5emVOGaOclbLMeFO030UrPtWFTUS0p80=
github.com/stretchr/objx v0.0.0-20150928122152-1a9d0bb9f541/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.1.4 h1:ToftOQTytwshuOSj6bDSolVUa3GINfJP/fg3OkkOzQQ=
github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
golang.org/x/net v0.0.0-20171212005608-d866cfc389ce h1:4g3VPcb++AP2cNa6CQ0iACUoH7J/3Jxojq0mmJun9A4=
golang.org/x/net v0.0.0-20171212005608-d866cfc389ce/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

0 comments on commit b716711

Please sign in to comment.