diff --git a/.golangci.yml b/.golangci.yml index 2d4d891..f447ee1 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,6 +1,6 @@ run: # timeout for analysis, e.g. 30s, 5m, default is 1m - deadline: 2m + timeout: 2m linters: enable: #- golint diff --git a/.travis.yml b/.travis.yml index 8edaf2a..cf8c68a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ before_install: - sudo apt-get update - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce # Install golangci-lint - - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.18.0 + - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.20.0 - echo "TRAVIS_GO_VERSION=${TRAVIS_GO_VERSION}" install: diff --git a/testing/docker.go b/testing/docker.go index cbd9e33..7ec0d5b 100644 --- a/testing/docker.go +++ b/testing/docker.go @@ -199,7 +199,7 @@ func (d *DockerContainer) Logs() (io.ReadCloser, error) { }) } -func (d *DockerContainer) portMapping(selectFirst bool, cPort int) (containerPort uint, hostIP string, hostPort uint, err error) { +func (d *DockerContainer) portMapping(selectFirst bool, cPort int) (containerPort uint, hostIP string, hostPort uint, err error) { // nolint:unparam if !d.containerInspected { if err := d.Inspect(); err != nil { d.t.Fatal(err)