Skip to content

Commit

Permalink
Merge pull request #36 from rerost/rerost/use-go-mod
Browse files Browse the repository at this point in the history
Use go mod
  • Loading branch information
Hazumi Ichijo authored Jun 14, 2019
2 parents 7017d5e + 1cc5779 commit 3fa6ea4
Show file tree
Hide file tree
Showing 7 changed files with 139 additions and 293 deletions.
10 changes: 7 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@ version: 2
jobs:
build:
docker:
- image: circleci/golang:1.11
- image: circleci/golang:1.12
working_directory: /go/src/github.com/rerost/es-cli
steps:
- checkout
- run: make build
environment:
GO111MODULE: "on"
test:
docker:
- image: circleci/golang:1.11
- image: circleci/golang:1.12
- image: docker.elastic.co/elasticsearch/elasticsearch:6.2.0
environment:
http.host: '0.0.0.0'
Expand All @@ -22,9 +24,11 @@ jobs:
- checkout
- setup_remote_docker
- run: make test
environment:
GO111MODULE: "on"
release:
docker:
- image: circleci/golang:1.11
- image: circleci/golang:1.12
working_directory: /go/src/github.com/rerost/es-cli
steps:
- checkout
Expand Down
1 change: 1 addition & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export GO111MODULE=on
232 changes: 0 additions & 232 deletions Gopkg.lock

This file was deleted.

54 changes: 0 additions & 54 deletions Gopkg.toml

This file was deleted.

5 changes: 1 addition & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ all: es-cli
PHONY: vendor
vendor:
go get github.com/izumin5210/gex/cmd/gex
# Gex depends on dep
go get github.com/golang/dep/cmd/dep

dep ensure -v -vendor-only
go mod download

PHONY: go-test
go-test: vendor
Expand Down
28 changes: 28 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
module github.com/rerost/es-cli

go 1.12

require (
github.com/Songmu/retry v0.0.0-20181014062827-902aa877ec14 // indirect
github.com/google/go-cmp v0.2.0
github.com/hashicorp/go-version v1.0.0 // indirect
github.com/izumin5210/cgt v0.0.0-20181103063432-ac2ef913eb51
github.com/izumin5210/gex v0.4.5 // indirect
github.com/mattn/go-colorable v0.1.0 // indirect
github.com/mattn/go-isatty v0.0.4 // indirect
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db
github.com/onsi/gomega v1.5.0 // indirect
github.com/srvc/fail v3.1.0+incompatible
github.com/stretchr/testify v1.3.0 // indirect
github.com/tcnksm/ghr v0.0.0-20181005104214-1dabd986f323
github.com/tcnksm/go-gitconfig v0.0.0-20150505151006-6411ba19847f // indirect
github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e // indirect
github.com/urfave/cli v1.20.0
golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd // indirect
golang.org/x/net v0.0.0-20181108082009-03003ca0c849 // indirect
golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288 // indirect
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f // indirect
golang.org/x/sys v0.0.0-20190614160838-b47fdc937951 // indirect
google.golang.org/appengine v1.3.0 // indirect
gopkg.in/guregu/null.v3 v3.4.0
)
Loading

0 comments on commit 3fa6ea4

Please sign in to comment.