diff --git a/.circleci/config.yml b/.circleci/config.yml index 92c1a4ca..7367cc19 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: circleci/golang:1.10.3 + - image: circleci/golang:1.12.0 environment: GOBIN: /tmp/workspace/bin @@ -21,7 +21,7 @@ jobs: export PATH="$GOBIN:$PATH" go env go version - make get_tools && make get_vendor_deps && make test + make get_tools && make && make test - save_cache: key: v1-dep-{{ .Branch }} paths: diff --git a/Gopkg.lock b/Gopkg.lock deleted file mode 100644 index 4589d933..00000000 --- a/Gopkg.lock +++ /dev/null @@ -1,47 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - name = "github.com/davecgh/go-spew" - packages = ["spew"] - revision = "346938d642f2ec3594ed81d874461961cd0faa76" - version = "v1.1.0" - -[[projects]] - name = "github.com/golang/protobuf" - packages = [ - "proto", - "proto/proto3_proto", - "proto/test_proto", - "ptypes/any" - ] - revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265" - version = "v1.1.0" - -[[projects]] - branch = "master" - name = "github.com/google/gofuzz" - packages = ["."] - revision = "24818f796faf91cd76ec7bddd72458fbced7a6c1" - -[[projects]] - name = "github.com/pmezard/go-difflib" - packages = ["difflib"] - revision = "792786c7400a136282c1664665ae0a8db921c6c2" - version = "v1.0.0" - -[[projects]] - name = "github.com/stretchr/testify" - packages = [ - "assert", - "require" - ] - revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686" - version = "v1.2.2" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - inputs-digest = "8ca44333ad8ca8f143fc1513ae309425e548d9deb7c567eb18d197a4fef9a250" - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml deleted file mode 100644 index cc862455..00000000 --- a/Gopkg.toml +++ /dev/null @@ -1,42 +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" -# -# [prune] -# non-go = false -# go-tests = true -# unused-packages = true - - -[[constraint]] - name = "github.com/davecgh/go-spew" - version = "1.1.0" - -[[constraint]] - branch = "master" - name = "github.com/google/gofuzz" - -[[constraint]] - name = "github.com/stretchr/testify" - version = "1.2.1" - -[prune] - go-tests = true - unused-packages = true diff --git a/Makefile b/Makefile index c322d019..392b395e 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,8 @@ GOTOOLS = \ - github.com/golang/dep/cmd/dep \ gopkg.in/alecthomas/gometalinter.v2 -GOTOOLS_CHECK = dep gometalinter.v2 +GOTOOLS_CHECK = gometalinter.v2 -all: check_tools get_vendor_deps test metalinter +all: check_tools test metalinter ######################################## ### Build @@ -32,11 +31,6 @@ update_tools: @echo "--> Updating tools" @go get -u $(GOTOOLS) -get_vendor_deps: - @rm -rf vendor/ - @echo "--> Running dep ensure" - @dep ensure - ######################################## ### Testing @@ -108,4 +102,4 @@ test_golang1.10rc: # To avoid unintended conflicts with file names, always add to .PHONY # unless there is a reason not to. # https://www.gnu.org/software/make/manual/html_node/Phony-Targets.html -.PHONY: build install check_tools get_tools update_tools get_vendor_deps test fmt metalinter metalinter_all +.PHONY: build install check_tools get_tools update_tools test fmt metalinter metalinter_all diff --git a/go.mod b/go.mod new file mode 100644 index 00000000..410e80ee --- /dev/null +++ b/go.mod @@ -0,0 +1,12 @@ +module github.com/tendermint/go-amino + +go 1.12 + +require ( + github.com/davecgh/go-spew v1.1.0 + github.com/golang/protobuf v1.1.0 + github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/stretchr/testify v1.2.2 + golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6 // indirect +)