From 29648b024e32223f88ee5de5b292b5ecb4c5347d Mon Sep 17 00:00:00 2001 From: Vatsal Parekh Date: Mon, 13 Jan 2025 14:35:19 +0530 Subject: [PATCH 1/2] Upgrade go version to 1.23 Signed-off-by: Vatsal Parekh --- Dockerfile | 2 +- go.mod | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4cd6d5eb..70ba62b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:experimental -FROM registry.suse.com/bci/golang:1.22 as build +FROM registry.suse.com/bci/golang:1.23 as build COPY go.mod go.sum main.go /src/ COPY pkg /src/pkg/ #RUN --mount=type=cache,target=/root/.cache/go-build \ diff --git a/go.mod b/go.mod index 739f84a9..495432bc 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/rancher/steve -go 1.22.0 +go 1.23 -toolchain go1.22.7 +toolchain go1.23.4 replace ( github.com/crewjam/saml => github.com/rancher/saml v0.2.0 From aa0472f0eac59cc6f52e2d351bce907bfcfe1a15 Mon Sep 17 00:00:00 2001 From: Vatsal Parekh Date: Tue, 14 Jan 2025 15:40:13 +0530 Subject: [PATCH 2/2] Upgrade golangci-lint to 1.63.4 Signed-off-by: Vatsal Parekh --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 97e8c01d..63759173 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -24,7 +24,7 @@ jobs: - name: Install golangci-lint uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # v6.0.1 with: - version: v1.59.0 + version: v1.63.4 - name: Install env-test run: go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest - name: Build