Skip to content

Commit

Permalink
Merge pull request #106 from atc0005/i105-update-golangci-lint-to-v1.…
Browse files Browse the repository at this point in the history
…32.0

Update golangci/golangci-lint to v1.32.0
  • Loading branch information
atc0005 authored Oct 25, 2020
2 parents 0e4aca1 + 42c06af commit fab2cb1
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion oldstable/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

FROM golang:1.14.10

ENV GOLANGCI_LINT_VERSION="v1.31.0"
ENV GOLANGCI_LINT_VERSION="v1.32.0"
ENV STATICCHECK_VERSION="2020.1.6"
ENV APT_BSDMAINUTILS_VERSION="11.1.2+b1"
ENV APT_TREE_VERSION="1.8.0-1"
Expand Down
2 changes: 1 addition & 1 deletion stable/Dockerfile.combined
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

FROM golang:1.15.3

ENV GOLANGCI_LINT_VERSION="v1.31.0"
ENV GOLANGCI_LINT_VERSION="v1.32.0"
ENV STATICCHECK_VERSION="2020.1.6"
ENV APT_BSDMAINUTILS_VERSION="11.1.2+b1"
ENV APT_TREE_VERSION="1.8.0-1"
Expand Down
2 changes: 1 addition & 1 deletion stable/Dockerfile.debian-build
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

FROM golang:1.15.3

ENV GOLANGCI_LINT_VERSION="v1.31.0"
ENV GOLANGCI_LINT_VERSION="v1.32.0"
ENV STATICCHECK_VERSION="2020.1.6"
ENV APT_BSDMAINUTILS_VERSION="11.1.2+b1"
ENV APT_TREE_VERSION="1.8.0-1"
Expand Down
6 changes: 3 additions & 3 deletions stable/Dockerfile.linting
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

# builder image
# use the same environment as our final image for binary compatibility
FROM golangci/golangci-lint:v1.31.0-alpine as builder
FROM golangci/golangci-lint:v1.32.0-alpine as builder

ENV STATICCHECK_VERSION="2020.1.6"

Expand All @@ -22,10 +22,10 @@ RUN GO111MODULE="on" go get honnef.co/go/tools/cmd/staticcheck@${STATICCHECK_VER
&& staticcheck --version

# For CI "linting only" use
FROM golangci/golangci-lint:v1.31.0-alpine
FROM golangci/golangci-lint:v1.32.0-alpine

# Intended to help identify the versions of the included linting tools
ENV GOLANGCI_LINT_VERSION="v1.31.0"
ENV GOLANGCI_LINT_VERSION="v1.32.0"
ENV STATICCHECK_VERSION="2020.1.6"

COPY --from=builder /go/bin/staticcheck /usr/bin/staticcheck
Expand Down
2 changes: 1 addition & 1 deletion tools/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.13

require (
// golangci-lint - used in our containers
github.com/golangci/golangci-lint v1.31.0
github.com/golangci/golangci-lint v1.32.0

// staticcheck - used in our containers
honnef.co/go/tools v0.0.1-2020.1.6
Expand Down
2 changes: 1 addition & 1 deletion unstable/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

FROM golang:1.15.3

ENV GOLANGCI_LINT_VERSION="v1.31.0"
ENV GOLANGCI_LINT_VERSION="v1.32.0"
ENV STATICCHECK_VERSION="2020.1.6"
ENV APT_BSDMAINUTILS_VERSION="11.1.2+b1"
ENV APT_TREE_VERSION="1.8.0-1"
Expand Down

0 comments on commit fab2cb1

Please sign in to comment.