From 4656038b59c5cc7dc5aa4607a0bd720d34c1fe6b Mon Sep 17 00:00:00 2001 From: Aleks Lozovyuk Date: Sun, 16 Feb 2025 15:36:56 +0200 Subject: [PATCH 1/3] Update for support Go 1.24 --- .github/workflows/ci.yaml | 4 ++-- .golangci.yml | 2 +- Dockerfile | 2 +- go.mod | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 08779eac..74a6d01e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -39,7 +39,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: 1.23 + go-version: 1.24 - name: Checkout Code Base uses: actions/checkout@v4 @@ -66,7 +66,7 @@ jobs: needs: [license-check, lint] strategy: matrix: - go-version: [1.23, stable] + go-version: [1.24, stable] os: [ubuntu-latest] runs-on: ${{ matrix.os }} steps: diff --git a/.golangci.yml b/.golangci.yml index 8def6cc0..dd735897 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -454,7 +454,7 @@ linters-settings: unused: # Select the Go version to target. The default is '1.13'. - go: "1.23" + go: "1.24" whitespace: multi-if: false # Enforces newlines (or comments) after every multi-line if statement diff --git a/Dockerfile b/Dockerfile index df53ba2f..5ca794f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. # -FROM golang:1.23 as build +FROM golang:1.24 as build WORKDIR /kvctl diff --git a/go.mod b/go.mod index fb5d32c1..74155d9b 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/apache/kvrocks-controller -go 1.23 +go 1.24 -toolchain go1.23.4 +toolchain go1.24.0 require ( github.com/fatih/color v1.18.0 From 9b19e96b7f0381277e805b038bd7f52d648a2772 Mon Sep 17 00:00:00 2001 From: Aleks Lozovyuk Date: Sun, 16 Feb 2025 15:37:30 +0200 Subject: [PATCH 2/3] fix --- .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 74a6d01e..9978a40a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -66,7 +66,7 @@ jobs: needs: [license-check, lint] strategy: matrix: - go-version: [1.24, stable] + go-version: [1.24] os: [ubuntu-latest] runs-on: ${{ matrix.os }} steps: From 6bdff246562a9a66cb64e3d4aea1c37daf5e316f Mon Sep 17 00:00:00 2001 From: Aleks Lozovyuk Date: Sun, 16 Feb 2025 15:41:33 +0200 Subject: [PATCH 3/3] Fix lint to support go 1.24 --- .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 9978a40a..bd47126e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -58,7 +58,7 @@ jobs: run: | export GOPATH=$HOME/go export PATH=$PATH:$GOPATH/bin - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.63.4 + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.64.5 make lint build-test: