Merge pull request #211 from tonistiigi/tonistiigi/go-1.23

update Go to 1.23
tonistiigi · Sep 28, 2024 · 078d9fe · 078d9fe
2 parents 8754824 + 556fa96
commit 078d9fe
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.21
-ARG GOLANGCI_LINT_VERSION=1.54.2
+ARG GO_VERSION=1.23
+ARG GOLANGCI_LINT_VERSION=1.61.0
 
 FROM golang:${GO_VERSION}-alpine
 RUN apk add --no-cache git gcc musl-dev