chg: update go version in makefile, travis and dockerfile

maticnetwork · Mar 11, 2024 · 4ee8508 · 4ee8508
1 parent 128c53b
commit 4ee8508
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,7 @@ jobs:
     - stage: lint
       os: linux
       dist: bionic
-      go: 1.21.x
+      go: 1.22.x
       env:
         - lint
       git:
@@ -28,7 +28,7 @@ jobs:
       os: linux
       arch: amd64
       dist: bionic
-      go: 1.21.x
+      go: 1.22.x
       env:
         - docker
       services:
@@ -45,7 +45,7 @@ jobs:
       os: linux
       arch: arm64
       dist: bionic
-      go: 1.21.x
+      go: 1.22.x
       env:
         - docker
       services:
@@ -62,7 +62,7 @@ jobs:
       if: type = push
       os: linux
       dist: bionic
-      go: 1.21.x
+      go: 1.22.x
       env:
         - ubuntu-ppa
         - GO111MODULE=on
@@ -87,7 +87,7 @@ jobs:
       os: linux
       dist: bionic
       sudo: required
-      go: 1.21.x
+      go: 1.22.x
       env:
         - azure-linux
       git:
@@ -159,7 +159,7 @@ jobs:
       if: type = push
       os: osx
       osx_image: xcode14.2
-      go: 1.21.x
+      go: 1.22.x
       env:
         - azure-osx
       git:
@@ -175,7 +175,7 @@ jobs:
       os: linux
       arch: amd64
       dist: bionic
-      go: 1.21.x
+      go: 1.22.x
       script:
         - travis_wait 30 go run build/ci.go test $TEST_PACKAGES
 
@@ -184,14 +184,14 @@ jobs:
       os: linux
       arch: arm64
       dist: bionic
-      go: 1.21.x
+      go: 1.22.x
       script:
         - travis_wait 30 go run build/ci.go test $TEST_PACKAGES
 
     - stage: build
       os: linux
       dist: bionic
-      go: 1.21.x
+      go: 1.22.x
       script:
         - travis_wait 30 go run build/ci.go test $TEST_PACKAGES
 
@@ -200,7 +200,7 @@ jobs:
       if: type = cron || (type = push && tag ~= /^v[0-9]/)
       os: linux
       dist: bionic
-      go: 1.21.x
+      go: 1.22.x
       env:
         - ubuntu-ppa
       git:
@@ -223,7 +223,7 @@ jobs:
       if: type = cron
       os: linux
       dist: bionic
-      go: 1.21.x
+      go: 1.22.x
       env:
         - azure-purge
       git:
@@ -236,7 +236,7 @@ jobs:
       if: type = cron
       os: linux
       dist: bionic
-      go: 1.21.x
+      go: 1.22.x
       script:
         - travis_wait 30 go run build/ci.go test  -race $TEST_PACKAGES
 
diff --git a/Dockerfile.alltools b/Dockerfile.alltools
@@ -1,5 +1,5 @@
 # Build Geth in a stock Go builder container
-FROM golang:1.21.4-alpine as builder
+FROM golang:1.22.1-alpine as builder
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git
 

diff --git a/Makefile b/Makefile
@@ -65,7 +65,7 @@ test-txpool-race:
 
 test-race:
 	$(GOTEST) --timeout 15m -race -shuffle=on $(TESTALL)
-	
+
 gocovmerge-deps:
 	$(GOBUILD) -o $(GOBIN)/gocovmerge github.com/wadey/gocovmerge
 
@@ -201,7 +201,7 @@ geth-windows-amd64:
 	@ls -ld $(GOBIN)/geth-windows-* | grep amd64
 
 PACKAGE_NAME          := github.com/maticnetwork/bor
-GOLANG_CROSS_VERSION  ?= v1.21.4
+GOLANG_CROSS_VERSION  ?= v1.22.1
 
 .PHONY: release-dry-run
 release-dry-run: