From f58074ae9b8d098583fe8297f650834bfa5b9be9 Mon Sep 17 00:00:00 2001 From: knqyf263 Date: Wed, 7 Feb 2024 09:28:54 +0400 Subject: [PATCH 1/2] chore: bump Go to 1.22 Signed-off-by: knqyf263 --- .golangci.yaml | 2 +- Dockerfile.protoc | 2 +- go.mod | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.golangci.yaml b/.golangci.yaml index bc8a0c66b786..9cc7256ecaf0 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -87,7 +87,7 @@ linters: - gocritic run: - go: '1.21' + go: '1.22' skip-files: - ".*_mock.go$" - ".*_test.go$" diff --git a/Dockerfile.protoc b/Dockerfile.protoc index 1ee880f8fa5c..9b21ed16a55d 100644 --- a/Dockerfile.protoc +++ b/Dockerfile.protoc @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 golang:1.21 +FROM --platform=linux/amd64 golang:1.22 # Set environment variable for protoc ENV PROTOC_ZIP=protoc-3.19.4-linux-x86_64.zip diff --git a/go.mod b/go.mod index e36c08e265dc..efce687cd9e7 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/aquasecurity/trivy -go 1.21 +go 1.22 + +toolchain go1.22.0 require ( github.com/Azure/azure-sdk-for-go v68.0.0+incompatible From 4b28e2d2195eaf4ce997fcc576d17df37e06a74e Mon Sep 17 00:00:00 2001 From: Simar Date: Wed, 28 Feb 2024 21:55:29 -0700 Subject: [PATCH 2/2] update tinygo to v0.31.1 --- aqua.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aqua.yaml b/aqua.yaml index 0ffe7fbe2b81..af251aeec167 100644 --- a/aqua.yaml +++ b/aqua.yaml @@ -5,6 +5,6 @@ registries: - type: standard ref: v3.157.0 # renovate: depName=aquaproj/aqua-registry packages: -- name: tinygo-org/tinygo@v0.29.0 +- name: tinygo-org/tinygo@v0.31.1 - name: WebAssembly/binaryen@version_112 - name: magefile/mage@v1.14.0