upgrade to golang 1.22

XinFinOrg · Dec 17, 2024 · 7d079f3 · 7d079f3
1 parent 0f8abf5
commit 7d079f3
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 188 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -57,7 +57,7 @@ jobs:
         uses: actions/setup-go@v5
         with:
           cache: false
-          go-version: '1.21.x'
+          go-version: '1.22.x'
       - name: Run tests
         run: ${{ matrix.script }}
         env:

diff --git a/.travis.yml.bak b/.travis.yml.bak
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21-alpine as builder
+FROM golang:1.22-alpine as builder
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git
 

diff --git a/Dockerfile.bootnode b/Dockerfile.bootnode
@@ -1,4 +1,4 @@
-FROM golang:1.21-alpine as builder
+FROM golang:1.22-alpine as builder
 
 RUN apk add --no-cache make gcc musl-dev linux-headers
 

diff --git a/Dockerfile.node b/Dockerfile.node
@@ -1,4 +1,4 @@
-FROM golang:1.21-alpine as builder
+FROM golang:1.22-alpine as builder
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git
 

diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@
 
 GOBIN = $(shell pwd)/build/bin
 GOFMT = gofmt
-GO ?= 1.21.3
+GO ?= 1.22.10
 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
@@ -115,7 +115,7 @@ func doInstall(cmdline []string) {
 
 		if minor < 21 {
 			log.Println("You have Go version", runtime.Version())
-			log.Println("XDC requires at least Go version 1.21 and cannot")
+			log.Println("XDC requires at least Go version 1.22 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
@@ -1,4 +1,4 @@
-FROM golang:1.21-alpine as builder
+FROM golang:1.22-alpine as builder
 
 RUN apk add make build-base linux-headers
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/XinFinOrg/XDPoSChain
 
-go 1.21
+go 1.22
 
 require (
 	github.com/VictoriaMetrics/fastcache v1.12.2