From 97035daea0d32c2c2ba841826bb7116228a7e999 Mon Sep 17 00:00:00 2001 From: Rohan Kumar Date: Wed, 17 Nov 2021 19:30:21 -0800 Subject: [PATCH] Chore(deps): bump deps - Bump golangci-lint to v1.43.0 (fixing a typo) - Update golangci-lint configs for v1.43.0 - Bump the go toolchain used in CI to 1.17.3 - Bump go-internal and /x/sys to the latest commits --- .builds/install-linters.sh | 2 +- .builds/setup-toolchain.sh | 4 ++-- .golangci.yml | 13 +------------ go.mod | 4 ++-- go.sum | 4 ++++ 5 files changed, 10 insertions(+), 17 deletions(-) diff --git a/.builds/install-linters.sh b/.builds/install-linters.sh index 1d96d82..7073dbc 100644 --- a/.builds/install-linters.sh +++ b/.builds/install-linters.sh @@ -4,7 +4,7 @@ set -e -u -x # golangci-lint is installed from master -linters='github.com/golangci/golangci-lint/cmd/golangci-lint@1.43.0 +linters='github.com/golangci/golangci-lint/cmd/golangci-lint@v1.43.0 github.com/praetorian-inc/gokart@latest github.com/mrtazz/checkmake/cmd/checkmake@latest github.com/quasilyte/go-consistent@latest diff --git a/.builds/setup-toolchain.sh b/.builds/setup-toolchain.sh index 90cb3d9..dce1f06 100644 --- a/.builds/setup-toolchain.sh +++ b/.builds/setup-toolchain.sh @@ -7,8 +7,8 @@ set -e -u # Binaries made with `make dist-reprod` are reproducible for a given Go installation. # All builds with the below Go installation, for example, should have the same checksums. -go_version=1.17.2 -go_hash=f242a9db6a0ad1846de7b6d94d507915d14062660616a61ef7c808a76e4f1676 +go_version=1.17.3 +go_hash=550f9845451c0c94be679faf116291e7807a8d78b43149f9506c1b15eb89008c go_tarball="go$go_version.linux-amd64.tar.gz" curl -sSLo "$go_tarball" "https://dl.google.com/go/go$go_version.linux-amd64.tar.gz" diff --git a/.golangci.yml b/.golangci.yml index 9e771bd..3a14a08 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -110,11 +110,11 @@ linters: - unparam - unused - varcheck - - varnamelen - wastedassign - whitespace - wrapcheck - wsl + # - varnamelen # not always applicable # - gomodguard # obsoleted by go-arch-lint # - paralleltest # not always relevant # - tenv # only for go117+; I'll require go117+ when go119 is out. @@ -280,17 +280,6 @@ linters-settings: config: global: audit: enabled - varnamelen: - max-distance: 6 - ignore-names: - - C - - G - - r # rune - ignore-decls: - - cs charsets.CharsetCollection - - cs *charsets.CharsetCollection - - cs CharsetCollection - - cs *CharsetCollection wsl: force-case-trailing-whitespace: 2 # force-short-decl-cuddling: true diff --git a/go.mod b/go.mod index 447d708..8b0d342 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.15 require ( git.sr.ht/~sircmpwn/getopt v1.0.0 github.com/rivo/uniseg v0.2.0 - github.com/rogpeppe/go-internal v1.8.1-0.20210923151022-86f73c517451 - golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect + github.com/rogpeppe/go-internal v1.8.1-0.20211023094830-115ce09fd6b4 + golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1 // indirect golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 ) diff --git a/go.sum b/go.sum index 53c9b26..631f0ad 100644 --- a/go.sum +++ b/go.sum @@ -15,12 +15,16 @@ github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rogpeppe/go-internal v1.8.1-0.20210923151022-86f73c517451 h1:d1PiN4RxzIFXCJTvRkvSkKqwtRAl5ZV4lATKtQI0B7I= github.com/rogpeppe/go-internal v1.8.1-0.20210923151022-86f73c517451/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= +github.com/rogpeppe/go-internal v1.8.1-0.20211023094830-115ce09fd6b4 h1:Ha8xCaq6ln1a+R91Km45Oq6lPXj2Mla6CRJYcuV2h1w= +github.com/rogpeppe/go-internal v1.8.1-0.20211023094830-115ce09fd6b4/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 h1:M69LAlWZCshgp0QSzyDcSsSIejIEeuaCVpmwcKwyLMk= golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1 h1:kwrAHlwJ0DUBZwQ238v+Uod/3eZ8B2K5rYsUHBQvzmI= +golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= -- 2.45.2