diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f339deb474..985beb80d8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: 1.20.x + go-version: 1.21.x - name: Install dependencies on Linux if: runner.os == 'Linux' @@ -61,7 +61,7 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: 1.20.x + go-version: 1.21.x - name: Install dependencies on Linux if: runner.os == 'Linux' @@ -89,7 +89,7 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: 1.20.x + go-version: 1.21.x - name: Install dependencies on Linux if: runner.os == 'Linux' @@ -140,7 +140,7 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: 1.20.x + go-version: 1.21.x - name: Install dependencies on Linux if: runner.os == 'Linux' @@ -196,7 +196,7 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: 1.20.x + go-version: 1.21.x - name: Checkout matic-cli uses: actions/checkout@v3 diff --git a/.github/workflows/packager.yml b/.github/workflows/packager.yml index 27386c55b6..18e7c397e5 100644 --- a/.github/workflows/packager.yml +++ b/.github/workflows/packager.yml @@ -21,7 +21,7 @@ jobs: - name: Set up Go uses: actions/setup-go@master with: - go-version: 1.20.x + go-version: 1.21.x - name: Adding TAG to ENV run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 41c6ba47b0..4e97f7d162 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ jobs: - name: Set up Go uses: actions/setup-go@master with: - go-version: 1.20.x + go-version: 1.21.x - name: Prepare id: prepare diff --git a/.travis.yml b/.travis.yml index ecb3ce358f..4bdcae7484 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,7 +62,7 @@ jobs: if: type = push os: linux dist: bionic - go: 1.20.x + go: 1.21.x env: - ubuntu-ppa - GO111MODULE=on @@ -144,7 +144,7 @@ jobs: - sdkmanager "platform-tools" "platforms;android-15" "platforms;android-19" "platforms;android-24" "ndk-bundle" # Install Go to allow building with - - curl https://dl.google.com/go/go1.20.5.linux-amd64.tar.gz | tar -xz + - curl https://dl.google.com/go/go1.21.4.linux-amd64.tar.gz | tar -xz - export PATH=`pwd`/go/bin:$PATH - export GOROOT=`pwd`/go - export GOPATH=$HOME/go @@ -184,14 +184,14 @@ jobs: os: linux arch: arm64 dist: bionic - go: 1.20.x + go: 1.21.x script: - travis_wait 30 go run build/ci.go test $TEST_PACKAGES - stage: build os: linux dist: bionic - go: 1.20.x + go: 1.21.x script: - travis_wait 30 go run build/ci.go test $TEST_PACKAGES diff --git a/Dockerfile.alltools b/Dockerfile.alltools index b6bc74fd4c..5d3a2d7b0e 100644 --- a/Dockerfile.alltools +++ b/Dockerfile.alltools @@ -1,5 +1,5 @@ # Build Geth in a stock Go builder container -FROM golang:1.20.5-alpine as builder +FROM golang:1.21.4-alpine as builder RUN apk add --no-cache make gcc musl-dev linux-headers git diff --git a/Makefile b/Makefile index d70705134a..4f5590861b 100644 --- a/Makefile +++ b/Makefile @@ -201,7 +201,7 @@ geth-windows-amd64: @ls -ld $(GOBIN)/geth-windows-* | grep amd64 PACKAGE_NAME := github.com/maticnetwork/bor -GOLANG_CROSS_VERSION ?= v1.20.5 +GOLANG_CROSS_VERSION ?= v1.21.4 .PHONY: release-dry-run release-dry-run: