Skip to content

Commit 0ae2741

Browse files
authored
Merge pull request #10 from srvc/izumin5210/linters
Stop managing linters with Go Modules
2 parents 8730ee5 + ce70fd7 commit 0ae2741

File tree

5 files changed

+45
-88
lines changed

5 files changed

+45
-88
lines changed

.travis.yml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: go
2-
go: "1.11"
2+
go: "1.13"
33

44
env:
55
global:
@@ -15,13 +15,20 @@ cache:
1515
jobs:
1616
include:
1717
- name: 'lint'
18-
before_script:
19-
- go get github.com/izumin5210/gex/cmd/gex
20-
- gex --build
21-
script: gex reviewdog -reporter=github-pr-review
18+
script: make lint
2219
if: type = 'pull_request'
2320

24-
- name: 'test'
25-
script: go test -v -coverpkg ./... -coverprofile coverage.txt -covermode atomic ./...
21+
- script: make cover
2622
after_success: bash <(curl -s https://codecov.io/bash)
2723
if: type != 'pull_request'
24+
25+
- &test
26+
go: "1.12"
27+
script: make test
28+
if: type != 'pull_request'
29+
30+
- <<: *test
31+
go: "1.11"
32+
33+
- <<: *test
34+
go: "master"

Makefile

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
PATH := ${PWD}/bin:${PATH}
2+
export PATH
3+
4+
# linters
5+
bin/reviewdog:
6+
curl -sfL https://raw.githubusercontent.com/reviewdog/reviewdog/master/install.sh | sh -s -- -b ./bin v0.9.13
7+
8+
bin/golangci-lint:
9+
curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b ./bin v1.19.0
10+
11+
# Commands
12+
#----------------------------------------------------------------
13+
14+
.PHONY: lint
15+
lint: ./bin/reviewdog ./bin/golangci-lint
16+
ifdef CI
17+
reviewdog -reporter=github-pr-review
18+
else
19+
reviewdog -diff="git diff master"
20+
endif
21+
22+
.PHONY: test
23+
test:
24+
go test -v ./...
25+
26+
.PHONY: cover
27+
cover:
28+
go test -v -coverprofile coverage.txt -covermode atomic ./...

go.mod

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,5 @@
11
module github.com/srvc/wraperr
22

3-
require (
4-
github.com/google/go-cmp v0.2.0 // indirect
5-
github.com/google/go-github v17.0.0+incompatible // indirect
6-
github.com/google/go-querystring v1.0.0 // indirect
7-
github.com/haya14busa/errorformat v0.0.0-20180607161917-689b7d67b7a8 // indirect
8-
github.com/haya14busa/reviewdog v0.0.0-20180723114510-ffb00ef78fd3
9-
github.com/kisielk/errcheck v1.1.0
10-
github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 // indirect
11-
github.com/mattn/go-shellwords v1.0.3 // indirect
12-
github.com/xanzy/go-gitlab v0.11.1 // indirect
13-
golang.org/x/lint v0.0.0-20180702182130-06c8688daad7
14-
golang.org/x/net v0.0.0-20181005035420-146acd28ed58 // indirect
15-
golang.org/x/oauth2 v0.0.0-20181003184128-c57b0facaced // indirect
16-
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f // indirect
17-
golang.org/x/tools v0.0.0-20181207222222-4c874b978acb
18-
google.golang.org/appengine v1.2.0 // indirect
19-
gopkg.in/yaml.v2 v2.2.1 // indirect
20-
honnef.co/go/tools v0.0.0-20180920025451-e3ad64cb4ed3
21-
mvdan.cc/unparam v0.0.0-20180912072546-8f80bf61b2ce
22-
)
3+
require golang.org/x/tools v0.0.0-20181207222222-4c874b978acb
4+
5+
go 1.11

go.sum

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,2 @@
1-
github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
2-
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
3-
github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
4-
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
5-
github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
6-
github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
7-
github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
8-
github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
9-
github.com/haya14busa/errorformat v0.0.0-20180607161917-689b7d67b7a8 h1:PWjuWhRwYiC8LiS4MmRfhA0bovj56VK3uJ1lSGkXkSo=
10-
github.com/haya14busa/errorformat v0.0.0-20180607161917-689b7d67b7a8/go.mod h1:TNvdwGsVM9pBShG9giP++XhdzBWSSKnvNAO9K7ERnyw=
11-
github.com/haya14busa/reviewdog v0.0.0-20180723114510-ffb00ef78fd3 h1:zue79RaaFpucGy7rjtHiGD6iZr/b0Wn/EG4RfVRc52Q=
12-
github.com/haya14busa/reviewdog v0.0.0-20180723114510-ffb00ef78fd3/go.mod h1:6S1pmGlj8cAOvGnz97vdbRPjFTZhHQ0NLSIka21vY8A=
13-
github.com/kisielk/errcheck v1.1.0 h1:ZqfnKyx9KGpRcW04j5nnPDgRgoXUeLh2YFBeFzphcA0=
14-
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
15-
github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg=
16-
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
17-
github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3vkb4ax0b5D2DHbNAUsen0Gx5wZoq3lV4=
18-
github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
19-
github.com/mattn/go-shellwords v1.0.3 h1:K/VxK7SZ+cvuPgFSLKi5QPI9Vr/ipOf4C1gN+ntueUk=
20-
github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
21-
github.com/xanzy/go-gitlab v0.11.1 h1:kgVxG9YFerbzMnLuwcFio5nwdv/5bCDHgm7WviT+EEE=
22-
github.com/xanzy/go-gitlab v0.11.1/go.mod h1:CRKHkvFWNU6C3AEfqLWjnCNnAs4nj8Zk95rX2S3X6Mw=
23-
golang.org/x/lint v0.0.0-20180702182130-06c8688daad7 h1:00BeQWmeaGazuOrq8Q5K5d3/cHaGuFrZzpaHBXfrsUA=
24-
golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
25-
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
26-
golang.org/x/net v0.0.0-20181005035420-146acd28ed58 h1:otZG8yDCO4LVps5+9bxOeNiCvgmOyt96J3roHTYs7oE=
27-
golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
28-
golang.org/x/oauth2 v0.0.0-20181003184128-c57b0facaced h1:4oqSq7eft7MdPKBGQK11X9WYUxmj6ZLgGTqYIbY1kyw=
29-
golang.org/x/oauth2 v0.0.0-20181003184128-c57b0facaced/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
30-
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=
31-
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
32-
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
33-
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
34-
golang.org/x/tools v0.0.0-20180826000951-f6ba57429505/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
351
golang.org/x/tools v0.0.0-20181207222222-4c874b978acb h1:YIXCxYolAiiPmVSqA4gVUVcHo8Mi1ivU7ANnK9a63JY=
362
golang.org/x/tools v0.0.0-20181207222222-4c874b978acb/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
37-
google.golang.org/appengine v1.2.0 h1:S0iUepdCWODXRvtE+gcRDd15L+k+k1AiHlMiMjefH24=
38-
google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
39-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
40-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
41-
gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
42-
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
43-
honnef.co/go/tools v0.0.0-20180920025451-e3ad64cb4ed3 h1:LyX67rVB0kBUFoROrQfzKwdrYLH1cRzHibxdJW85J1c=
44-
honnef.co/go/tools v0.0.0-20180920025451-e3ad64cb4ed3/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
45-
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b h1:DxJ5nJdkhDlLok9K6qO+5290kphDJbHOQO1DFFFTeBo=
46-
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4=
47-
mvdan.cc/unparam v0.0.0-20180912072546-8f80bf61b2ce h1:DpcxCmZGfqxSsiZ0L4Zl1hnE347853OP3JRbxFDMLKM=
48-
mvdan.cc/unparam v0.0.0-20180912072546-8f80bf61b2ce/go.mod h1:tC+aoVWJCzHfbH9PgkZ1waI175w0Sx5GA40rBgdPeo0=

tools.go

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)