Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate dep to go mod #77

Merged
merged 7 commits into from
May 4, 2019
Merged

Migrate dep to go mod #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9a555c0
Bump go version to 1.12
masutaka May 4, 2019
9271c2f
Fix golint installation
masutaka May 4, 2019
e0a29d2
$ GO111MODULE=on go mod init
masutaka May 4, 2019
360be2d
$ rm -rf Gopkg.toml Gopkg.lock vendor
masutaka May 4, 2019
3dbae7c
$ GO111MODULE=on go mod verify
masutaka May 4, 2019
aba4362
Migrate Makefile using go mod
masutaka May 4, 2019
aeb1740
Modified by `$ go build -o github-nippou`
masutaka May 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
/github-nippou
/pkg
/vendor
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: go

go:
- 1.10.x
- 1.12.x

os:
- linux
Expand Down
126 changes: 0 additions & 126 deletions Gopkg.lock
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions Gopkg.toml
View file
Open in desktop

This file was deleted.

19 changes: 8 additions & 11 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ CONFIGS := $(wildcard config/*)
VERSION := v$(shell grep 'const Version ' lib/version.go | sed -E 's/.*"(.+)"$$/\1/')
PACKAGES := $(shell go list ./...)

# If go-1.13 releases, I can remove this.
export GO111MODULE := on

ifeq (Windows_NT, $(OS))
NAME := $(NAME).exe
endif
Expand All @@ -12,14 +15,8 @@ all: $(NAME)

# Install dependencies for development
.PHONY: deps
deps: dep statik
dep ensure

.PHONY: dep
dep:
ifeq ($(shell command -v dep 2> /dev/null),)
go get github.com/golang/dep/cmd/dep
endif
deps: statik
go mod download

.PHONY: statik
statik:
Expand Down Expand Up @@ -54,13 +51,13 @@ test: statik/statik.go
test-all: deps-test-all vet lint test

.PHONY: deps-test-all
deps-test-all: dep statik golint statik/statik.go
dep ensure
deps-test-all: statik golint statik/statik.go
go mod download

.PHONY: golint
golint:
ifeq ($(shell command -v golint 2> /dev/null),)
go get github.com/golang/lint/golint
go get golang.org/x/lint/golint
endif

.PHONY: vet
Expand Down
18 changes: 18 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
module github.com/masutaka/github-nippou

go 1.12

require (
github.com/golang/protobuf v1.0.0
github.com/google/go-github v0.0.0-20180223213941-b1658317c4f5
github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135
github.com/inconshreveable/mousetrap v1.0.0
github.com/rakyll/statik v0.1.6
github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c
github.com/spf13/cobra v0.0.0-20180221175153-a1e4933ab784
github.com/spf13/pflag v1.0.0
golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01
golang.org/x/oauth2 v0.0.0-20180207181906-543e37812f10
google.golang.org/appengine v1.0.0
gopkg.in/yaml.v2 v2.0.0-20190319135612-7b8349ac747c
)
22 changes: 22 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
github.com/golang/protobuf v1.0.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/google/go-github v0.0.0-20180223213941-b1658317c4f5 h1:vofPH6xG0sIqsrKetTD6DsYZJpLvRDEK4ohecZ3gHlo=
github.com/google/go-github v0.0.0-20180223213941-b1658317c4f5/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 h1:zLTLjkaOFEFIOxY5BWLFLwh+cL8vOBW4XJ2aqLE/Tf0=
github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/rakyll/statik v0.1.6 h1:uICcfUXpgqtw2VopbIncslhAmE5hwc4g20TEyEENBNs=
github.com/rakyll/statik v0.1.6/go.mod h1:OEi9wJV/fMUAGx1eNjq75DKDsJVuEv1U0oYdX6GX8Zs=
github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c h1:fyKiXKO1/I/B6Y2U8T7WdQGWzwehOuGIrljPtt7YTTI=
github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
github.com/spf13/cobra v0.0.0-20180221175153-a1e4933ab784 h1:I6Gja8SUbC12v3wjn/hN2o2swQR8gz62VTKKALMv+7Y=
github.com/spf13/cobra v0.0.0-20180221175153-a1e4933ab784/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
github.com/spf13/pflag v1.0.0 h1:oaPbdDe/x0UncahuwiPxW1GYJyilRAdsPnq3e1yaPcI=
github.com/spf13/pflag v1.0.0/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01 h1:po1f06KS05FvIQQA2pMuOWZAUXiy1KYdIf0ElUU2Hhc=
golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/oauth2 v0.0.0-20180207181906-543e37812f10 h1:ztZz7pTbygSoJgnsO6TYI8nOvZp3HowfTtpGeFuSu5g=
golang.org/x/oauth2 v0.0.0-20180207181906-543e37812f10/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
google.golang.org/appengine v1.0.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.0.0-20190319135612-7b8349ac747c h1:nsJYChHWxeFA6+48RmvBXEvQNanNyh933kZYWiu2HBE=
gopkg.in/yaml.v2 v2.0.0-20190319135612-7b8349ac747c/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=