Skip to content

Commit 0556f6a

Browse files
committed
Support go1.13
Setup Travis CI to run on go 1.12 and 1.13. Update info about go versions in README. Rebuild go.mod,go.sum on go1.13.
1 parent 6864b2f commit 0556f6a

39 files changed

+73
-6709
lines changed

.golangci.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,9 @@ linters:
4848
enable:
4949
- bodyclose
5050
- deadcode
51-
- depguard
5251
- dupl
5352
- errcheck
54-
- funlen
53+
# - funlen - TODO: enable it when golangci.com will support it.
5554
- gochecknoinits
5655
- goconst
5756
- gocritic
@@ -77,6 +76,11 @@ linters:
7776
- unused
7877
- varcheck
7978

79+
# don't enable:
80+
# - depguard - until https://github.com/OpenPeeDeeP/depguard/issues/7 gets fixed
81+
# - maligned,prealloc
82+
# - gochecknoglobals
83+
8084
run:
8185
skip-dirs:
8286
- test/testdata_etc

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: go
22
go:
3-
- 1.11.x
43
- 1.12.x
4+
- 1.13.x
55

66
env:
77
global:

Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ maintainer-clean: clean
4040
check_generated:
4141
$(MAKE) --always-make generate
4242
git checkout -- go.mod go.sum # can differ between go1.11 and go1.12
43+
git checkout -- vendor/modules.txt # can differ between go1.12 and go1.13
4344
git diff --exit-code # check no changes
4445
.PHONY: check_generated
4546

README.md

+15-8
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,9 @@ use `--enable-all` and a new linter is added or even without `--enable-all`: whe
5252
It's highly recommended to install a fixed version of golangci-lint.
5353
Releases are available on the [releases page](https://github.com/golangci/golangci-lint/releases).
5454

55-
The recommended way to install golangci-lint (replace `vX.Y.Z` with the latest
56-
version from the [releases page](https://github.com/golangci/golangci-lint/releases)):
55+
Latest version: ![GitHub release](https://img.shields.io/github/release/golangci/golangci-lint.svg)
56+
57+
Here is the recommended way to install golangci-lint (replace `vX.Y.Z` with the latest version):
5758

5859
```bash
5960
# binary will be $(go env GOPATH)/bin/golangci-lint
@@ -868,10 +869,9 @@ linters:
868869
enable:
869870
- bodyclose
870871
- deadcode
871-
- depguard
872872
- dupl
873873
- errcheck
874-
- funlen
874+
# - funlen - TODO: enable it when golangci.com will support it.
875875
- gochecknoinits
876876
- goconst
877877
- gocritic
@@ -897,6 +897,11 @@ linters:
897897
- unused
898898
- varcheck
899899
900+
# don't enable:
901+
# - depguard - until https://github.com/OpenPeeDeeP/depguard/issues/7 gets fixed
902+
# - maligned,prealloc
903+
# - gochecknoglobals
904+
900905
run:
901906
skip-dirs:
902907
- test/testdata_etc
@@ -991,13 +996,15 @@ We don't recommend vendoring `golangci-lint` in your repo: you will get troubles
991996
No, you don't need to do it anymore.
992997
993998
**Which go versions are supported**
994-
Short answer: go 1.11 and newer are oficially supported.
999+
Short answer: go 1.12 and newer are oficially supported.
9951000
9961001
Long answer:
1002+
9971003
1. go < 1.9 isn't supported
998-
2. go 1.9 is supported by golangci-lint <= v1.10.2
999-
3. go 1.10 is officially supported by golangci-lint <= 1.15.0.
1000-
4. go1.11 and go1.12 are officially supported by the latest version of golangci-lint.
1004+
2. go1.9 is officially supported by golangci-lint <= v1.10.2
1005+
3. go1.10 is officially supported by golangci-lint <= 1.15.0.
1006+
4. go1.11 is officially supported by golangci-lint <= 1.17.1.
1007+
5. go1.12 and go1.13 are officially supported by the latest version of golangci-lint (>= 1.18.0).
10011008
10021009
**`golangci-lint` doesn't work**
10031010

README.tmpl.md

+9-6
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,9 @@ use `--enable-all` and a new linter is added or even without `--enable-all`: whe
5252
It's highly recommended to install a fixed version of golangci-lint.
5353
Releases are available on the [releases page](https://github.com/golangci/golangci-lint/releases).
5454

55-
The recommended way to install golangci-lint (replace `vX.Y.Z` with the latest
56-
version from the [releases page](https://github.com/golangci/golangci-lint/releases)):
55+
Latest version: ![GitHub release](https://img.shields.io/github/release/golangci/golangci-lint.svg)
56+
57+
Here is the recommended way to install golangci-lint (replace `vX.Y.Z` with the latest version):
5758

5859
```bash
5960
# binary will be $(go env GOPATH)/bin/golangci-lint
@@ -501,13 +502,15 @@ We don't recommend vendoring `golangci-lint` in your repo: you will get troubles
501502
No, you don't need to do it anymore.
502503

503504
**Which go versions are supported**
504-
Short answer: go 1.11 and newer are oficially supported.
505+
Short answer: go 1.12 and newer are oficially supported.
505506

506507
Long answer:
508+
507509
1. go < 1.9 isn't supported
508-
2. go 1.9 is supported by golangci-lint <= v1.10.2
509-
3. go 1.10 is officially supported by golangci-lint <= 1.15.0.
510-
4. go1.11 and go1.12 are officially supported by the latest version of golangci-lint.
510+
2. go1.9 is officially supported by golangci-lint <= v1.10.2
511+
3. go1.10 is officially supported by golangci-lint <= 1.15.0.
512+
4. go1.11 is officially supported by golangci-lint <= 1.17.1.
513+
5. go1.12 and go1.13 are officially supported by the latest version of golangci-lint (>= 1.18.0).
511514

512515
**`golangci-lint` doesn't work**
513516

go.sum

+2-7
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ github.com/golang/mock v1.0.0 h1:HzcpUG60pfl43n9d2qbdi/3l1uKpAmxlfWEPWtV/QxM=
4545
github.com/golang/mock v1.0.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
4646
github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
4747
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
48-
github.com/golangci/bodyclose v0.0.0-20190714144026-65da19158fa2 h1:nh/PMhIaxu+h8NOuhOwT2el9Ed08166oitASyNYqQzs=
49-
github.com/golangci/bodyclose v0.0.0-20190714144026-65da19158fa2/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk=
5048
github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 h1:23T5iq8rbUYlhpt5DB4XJkc6BU31uODLD1o1gKvZmD0=
5149
github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4=
5250
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a h1:w8hkcTqaFpzKqonE9uMCefW1WDie15eSP/4MssdenaM=
@@ -162,10 +160,10 @@ github.com/spf13/viper v1.0.2 h1:Ncr3ZIuJn322w2k1qmzXDnkLAdQMlJqBa9kfAH+irso=
162160
github.com/spf13/viper v1.0.2/go.mod h1:A8kyI5cUJhb8N+3pkfONlcEcZbueH6nhAm0Fq7SrnBM=
163161
github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
164162
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
165-
github.com/ultraware/funlen v0.0.1 h1:UeC9tpM4wNWzUJfan8z9sFE4QCzjjzlCZmuJN+aOkH0=
166-
github.com/ultraware/funlen v0.0.1/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA=
167163
github.com/timakin/bodyclose v0.0.0-00010101000000-87058b9bfcec h1:Ha5Eixh5Dgi14hDFFWsxoB/jR95rHjB1biKdK9VKkbQ=
168164
github.com/timakin/bodyclose v0.0.0-00010101000000-87058b9bfcec/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk=
165+
github.com/ultraware/funlen v0.0.1 h1:UeC9tpM4wNWzUJfan8z9sFE4QCzjjzlCZmuJN+aOkH0=
166+
github.com/ultraware/funlen v0.0.1/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA=
169167
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
170168
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
171169
github.com/valyala/fasthttp v1.2.0/go.mod h1:4vX61m6KN+xDduDNwXrhIAVZaZaZiQ1luJk8LWSxF3s=
@@ -178,9 +176,6 @@ golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACk
178176
golang.org/x/net v0.0.0-20170915142106-8351a756f30f/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
179177
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
180178
golang.org/x/net v0.0.0-20180911220305-26e67e76b6c3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
181-
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
182-
golang.org/x/net v0.0.0-20190313220215-9f648a60d977 h1:actzWV6iWn3GLqN8dZjzsB+CLt+gaV2+wsxroxiQI8I=
183-
golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
184179
golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI=
185180
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
186181
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=

vendor/github.com/go-toolsmith/astcast/astcast_generate.go

-163
This file was deleted.

0 commit comments

Comments
 (0)