diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca3a33bf9f..0fd3e7d79b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,7 +55,7 @@ jobs: uses: actions/setup-go@v5 with: cache: false - go-version: '1.22.x' + go-version: '1.23.x' - name: Run tests run: ${{ matrix.script }} env: diff --git a/Dockerfile b/Dockerfile index 5aba541a49..1e37ef1fee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22-alpine as builder +FROM golang:1.23-alpine as builder RUN apk add --no-cache make gcc musl-dev linux-headers git diff --git a/Dockerfile.bootnode b/Dockerfile.bootnode index 374bea3d3c..fdcc26cb01 100644 --- a/Dockerfile.bootnode +++ b/Dockerfile.bootnode @@ -1,4 +1,4 @@ -FROM golang:1.22-alpine as builder +FROM golang:1.23-alpine as builder RUN apk add --no-cache make gcc musl-dev linux-headers diff --git a/Dockerfile.node b/Dockerfile.node index b3e0f299d9..f10d4725bd 100644 --- a/Dockerfile.node +++ b/Dockerfile.node @@ -1,4 +1,4 @@ -FROM golang:1.22-alpine as builder +FROM golang:1.23-alpine as builder RUN apk add --no-cache make gcc musl-dev linux-headers git diff --git a/Makefile b/Makefile index cf6493922c..4e71322262 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ GOBIN = $(shell pwd)/build/bin GOFMT = gofmt -GO ?= 1.22.10 +GO ?= 1.23.6 GORUN = go run GO_PACKAGES = . GO_FILES := $(shell find $(shell go list -f '{{.Dir}}' $(GO_PACKAGES)) -name \*.go) diff --git a/build/ci.go b/build/ci.go index 9b13d4bff5..355f1fb8f2 100644 --- a/build/ci.go +++ b/build/ci.go @@ -121,9 +121,9 @@ func doInstall(cmdline []string) { var minor int fmt.Sscanf(strings.TrimPrefix(runtime.Version(), "go1."), "%d", &minor) - if minor < 21 { + if minor < 23 { log.Println("You have Go version", runtime.Version()) - log.Println("XDC requires at least Go version 1.22 and cannot") + log.Println("XDC requires at least Go version 1.23 and cannot") log.Println("be compiled with an earlier version. Please upgrade your Go installation.") os.Exit(1) } diff --git a/cicd/Dockerfile b/cicd/Dockerfile index c9f7de7cf6..9fd27eabed 100644 --- a/cicd/Dockerfile +++ b/cicd/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22-alpine as builder +FROM golang:1.23-alpine as builder RUN apk add make build-base linux-headers diff --git a/go.mod b/go.mod index 866a19a037..fdc5d7ef2b 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/XinFinOrg/XDPoSChain -go 1.22 - -toolchain go1.22.0 +go 1.23 require ( github.com/VictoriaMetrics/fastcache v1.12.2