Skip to content

Commit

Permalink
chore: bump Go to 1.20 (#5067)
Browse files Browse the repository at this point in the history
* update go.mod, linter, protoc dockerfile

* bump go version in .golangci.yaml
  • Loading branch information
DmitriyLewen committed Aug 30, 2023
1 parent 49fdd58 commit d4ca3cc
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ linters:
- misspell

run:
go: 1.19
go: '1.20'
skip-files:
- ".*._mock.go$"
- ".*._test.go$"
Expand Down
9 changes: 4 additions & 5 deletions Dockerfile.protoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=linux/amd64 golang:1.19
FROM --platform=linux/amd64 golang:1.20

# Set environment variable for protoc
ENV PROTOC_ZIP=protoc-3.19.4-linux-x86_64.zip
Expand All @@ -13,9 +13,8 @@ RUN curl --retry 5 -OL https://github.com/protocolbuffers/protobuf/releases/down
&& rm -f $PROTOC_ZIP

# Install Go tools
RUN go install \
github.com/twitchtv/twirp/protoc-gen-twirp@v8.1.0 \
google.golang.org/protobuf/cmd/protoc-gen-go@v1.27.1 \
github.com/magefile/mage@v1.14.0
RUN go install github.com/twitchtv/twirp/protoc-gen-twirp@v8.1.0
RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.27.1
RUN go install github.com/magefile/mage@v1.14.0

ENV TRIVY_PROTOC_CONTAINER=true
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/aquasecurity/trivy

go 1.19
go 1.20

require (
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
Expand Down

0 comments on commit d4ca3cc

Please sign in to comment.