From f78b8f4037ad275024cba10da5df085e7590032c Mon Sep 17 00:00:00 2001
From: Moritz Krafeld <m.krafeld@shopware.com>
Date: Fri, 20 Sep 2024 10:00:25 +0200
Subject: [PATCH] Bump go to 1.23

---
 .github/workflows/build.yml                        | 4 ++--
 .github/workflows/release.yml                      | 2 +-
 .github/workflows/smoke_test_reuse_job_windows.yml | 2 +-
 Dockerfile                                         | 4 ++--
 Makefile                                           | 2 +-
 README-zh_cn.md                                    | 2 +-
 README.md                                          | 2 +-
 go.mod                                             | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d8037db5..d5543236 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,11 +19,11 @@ jobs:
         id: go
         uses: actions/setup-go@v4
         with:
-          go-version: ^1.22
+          go-version: ^1.23
       - name: Install golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.59
+          version: v1.60.3
       - name: Install dependency
         run: if [ $(uname) == "Darwin" ]; then brew install gnu-sed ;fi
       - name: Build
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 431ad257..7c1b8ab9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: ^1.22
+          go-version: ^1.23
 
       - name: Set GOVERSION
         run: echo "GOVERSION=$(go version | sed -r 's/go version go(.*)\ .*/\1/')" >> $GITHUB_ENV
diff --git a/.github/workflows/smoke_test_reuse_job_windows.yml b/.github/workflows/smoke_test_reuse_job_windows.yml
index ec707558..4a01aa67 100644
--- a/.github/workflows/smoke_test_reuse_job_windows.yml
+++ b/.github/workflows/smoke_test_reuse_job_windows.yml
@@ -18,7 +18,7 @@ jobs:
         id: go
         uses: actions/setup-go@v4
         with:
-          go-version: ^1.22
+          go-version: ^1.23
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
diff --git a/Dockerfile b/Dockerfile
index 3175b207..81aef881 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22 AS builder
+FROM golang:1.23 AS builder
 
 LABEL maintainer="Rick Yu <cosmtrek@gmail.com>"
 
@@ -12,7 +12,7 @@ RUN --mount=type=cache,target=/go/pkg/mod go mod download
 
 RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build make ci && make install
 
-FROM golang:1.22
+FROM golang:1.23
 
 COPY --from=builder /go/bin/air  /go/bin/air
 
diff --git a/Makefile b/Makefile
index d2fc38ac..343dcd8d 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ LDFLAGS += -X "main.airVersion=$(AIRVER)"
 LDFLAGS += -X "main.goVersion=$(shell go version | sed -r 's/go version go(.*)\ .*/\1/')"
 
 GO := GO111MODULE=on CGO_ENABLED=0 go
-GOLANGCI_LINT_VERSION = v1.56.2
+GOLANGCI_LINT_VERSION = v1.60.3
 
 .PHONY: init
 init: install-golangci-lint
diff --git a/README-zh_cn.md b/README-zh_cn.md
index 2e0084b1..be2b11c6 100644
--- a/README-zh_cn.md
+++ b/README-zh_cn.md
@@ -205,7 +205,7 @@ services:
 
 ```Dockerfile
 # 选择你想要的版本，>= 1.16
-FROM golang:1.22-alpine
+FROM golang:1.23-alpine
 
 WORKDIR /app
 
diff --git a/README.md b/README.md
index 59ad8a01..c7f727f2 100644
--- a/README.md
+++ b/README.md
@@ -209,7 +209,7 @@ services:
 
 ```Dockerfile
 # Choose whatever you want, version >= 1.16
-FROM golang:1.22-alpine
+FROM golang:1.23-alpine
 
 WORKDIR /app
 
diff --git a/go.mod b/go.mod
index e579d5eb..f95af687 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/air-verse/air
 
-go 1.22
+go 1.23
 
 require (
 	dario.cat/mergo v1.0.0