From 1876fbf717936bda246e6bac993d667e3b11abac Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Fri, 27 Sep 2024 18:43:55 -0700 Subject: [PATCH 1/2] update Go to 1.23 Signed-off-by: Tonis Tiigi --- .github/workflows/ci.yml | 6 ++++-- Dockerfile | 2 +- hack/dockerfiles/generated-files.Dockerfile | 2 +- hack/dockerfiles/gomod.Dockerfile | 2 +- hack/dockerfiles/lint.Dockerfile | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e709e6de..e2d075d7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,8 +64,9 @@ jobs: strategy: matrix: go: + - "1.23" + - "1.22" - "1.21" - - "1.20" mode: - "root" - "noroot" @@ -100,8 +101,9 @@ jobs: - macos-latest - windows-latest go: + - "1.23" + - "1.22" - "1.21" - - "1.20" steps: - name: Checkout diff --git a/Dockerfile b/Dockerfile index 21c1f39f..d5f22283 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.21 +ARG GO_VERSION=1.23 ARG XX_VERSION=1.4.0 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx diff --git a/hack/dockerfiles/generated-files.Dockerfile b/hack/dockerfiles/generated-files.Dockerfile index 32f4fced..1b777ab0 100644 --- a/hack/dockerfiles/generated-files.Dockerfile +++ b/hack/dockerfiles/generated-files.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.21 +ARG GO_VERSION=1.23 ARG PROTOC_VERSION=3.11.4 FROM golang:${GO_VERSION} AS base diff --git a/hack/dockerfiles/gomod.Dockerfile b/hack/dockerfiles/gomod.Dockerfile index 0e98d1bb..bbaeef75 100644 --- a/hack/dockerfiles/gomod.Dockerfile +++ b/hack/dockerfiles/gomod.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.21 +ARG GO_VERSION=1.23 FROM golang:${GO_VERSION}-alpine AS gomod RUN apk add --no-cache git diff --git a/hack/dockerfiles/lint.Dockerfile b/hack/dockerfiles/lint.Dockerfile index d6d173dc..cbc24a66 100644 --- a/hack/dockerfiles/lint.Dockerfile +++ b/hack/dockerfiles/lint.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.21 +ARG GO_VERSION=1.23 ARG GOLANGCI_LINT_VERSION=1.54.2 FROM golang:${GO_VERSION}-alpine From 556fa96046c9f8580f9a36c559328c1d64443d13 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Fri, 27 Sep 2024 18:49:20 -0700 Subject: [PATCH 2/2] update golangci-lint to 1.61.0 Signed-off-by: Tonis Tiigi --- hack/dockerfiles/lint.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/dockerfiles/lint.Dockerfile b/hack/dockerfiles/lint.Dockerfile index cbc24a66..50b8ce07 100644 --- a/hack/dockerfiles/lint.Dockerfile +++ b/hack/dockerfiles/lint.Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG GO_VERSION=1.23 -ARG GOLANGCI_LINT_VERSION=1.54.2 +ARG GOLANGCI_LINT_VERSION=1.61.0 FROM golang:${GO_VERSION}-alpine RUN apk add --no-cache git gcc musl-dev