Skip to content

Commit

Permalink
migrated from dep to Go modules
Browse files Browse the repository at this point in the history
 - remove dep artifacts
 - remove traces of dep from make file: go build will handle those for us
 - update circelci config to go1.12
  • Loading branch information
liamsi committed Mar 6, 2019
1 parent 833d32f commit 3c50a13
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 100 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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:
Expand Down
47 changes: 0 additions & 47 deletions Gopkg.lock

This file was deleted.

42 changes: 0 additions & 42 deletions Gopkg.toml

This file was deleted.

12 changes: 3 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
12 changes: 12 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -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
)

0 comments on commit 3c50a13

Please sign in to comment.