diff --git a/Dockerfile.debian b/Dockerfile.debian index ece8587c1..e3e8c9d5d 100644 --- a/Dockerfile.debian +++ b/Dockerfile.debian @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.2 -FROM docker.io/library/golang:1.19-bullseye AS builder +FROM docker.io/library/golang:1.20-bullseye AS builder RUN apt update RUN apt install -y build-essential git bash ca-certificates libstdc++6 @@ -17,7 +17,7 @@ RUN --mount=type=cache,target=/root/.cache \ make all -FROM docker.io/library/golang:1.19-alpine3.16 AS tools-builder +FROM docker.io/library/golang:1.20-alpine3.17 AS tools-builder RUN apk --no-cache add build-base linux-headers git bash ca-certificates libstdc++ WORKDIR /app diff --git a/Makefile b/Makefile index 7994a2fae..68746589f 100644 --- a/Makefile +++ b/Makefile @@ -42,8 +42,8 @@ default: all ## go-version: print and verify go version go-version: - @if [ $(shell $(GO) version | cut -c 16-17) -lt 19 ]; then \ - echo "minimum required Golang version is 1.19"; \ + @if [ $(shell $(GO) version | cut -c 16-17) -lt 20 ]; then \ + echo "minimum required Golang version is 1.20"; \ exit 1 ;\ fi diff --git a/README.md b/README.md index ab6b6221a..8bfed6267 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ Bear in mind that SSD performance deteriorates when close to capacity. RAM: >=16GB, 64-bit architecture. -[Golang version >= 1.19](https://golang.org/doc/install); GCC 10+ or Clang; On Linux: kernel > v4 +[Golang version >= 1.20](https://golang.org/doc/install); GCC 10+ or Clang; On Linux: kernel > v4 🔬 more details on disk storage [here](https://erigon.substack.com/p/disk-footprint-changes-in-new-erigon?s=r) and [here](https://ledgerwatch.github.io/turbo_geth_release.html#Disk-space). @@ -210,7 +210,7 @@ Windows users may run erigon in 3 possible ways: build on windows : * [Git](https://git-scm.com/downloads) for Windows must be installed. If you're cloning this repository is very likely you already have it - * [GO Programming Language](https://golang.org/dl/) must be installed. Minimum required version is 1.19 + * [GO Programming Language](https://golang.org/dl/) must be installed. Minimum required version is 1.20 * GNU CC Compiler at least version 10 (is highly suggested that you install `chocolatey` package manager - see following point) * If you need to build MDBX tools (i.e. `.\wmake.ps1 db-tools`) diff --git a/cmd/release/go.mod b/cmd/release/go.mod index fac38415e..99bfb880c 100644 --- a/cmd/release/go.mod +++ b/cmd/release/go.mod @@ -1,5 +1,5 @@ module github.com/ledgerwatch/erigon/cmd/release/v2 -go 1.19 +go 1.20 require github.com/hashicorp/go-version v1.6.0 diff --git a/erigon-lib/.github/workflows/ci.yml b/erigon-lib/.github/workflows/ci.yml index b76ed8d3b..79ddb7169 100644 --- a/erigon-lib/.github/workflows/ci.yml +++ b/erigon-lib/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: fetch-depth: 0 # fetch git tags for "git describe" - uses: actions/setup-go@v4 with: - go-version: '1.19' + go-version: '1.20' - name: Install deps if: matrix.os == 'ubuntu-20.04' diff --git a/erigon-lib/go.mod b/erigon-lib/go.mod index 7d69503cb..1381257d0 100644 --- a/erigon-lib/go.mod +++ b/erigon-lib/go.mod @@ -1,6 +1,6 @@ module github.com/ledgerwatch/erigon-lib -go 1.19 +go 1.20 require ( github.com/erigontech/mdbx-go v0.27.17 diff --git a/go.mod b/go.mod index f2685c6d6..f6b5c8659 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/ledgerwatch/erigon -go 1.19 +go 1.20 require ( github.com/erigontech/mdbx-go v0.27.17 diff --git a/wmake.ps1 b/wmake.ps1 index 5f8b42d6c..ddb01d1e6 100644 --- a/wmake.ps1 +++ b/wmake.ps1 @@ -405,7 +405,7 @@ if (!Test-Path -Path [string](Join-Path $MyContext.Directory "\.git") -PathType if(!(Test-Git-Installed)) { exit 1 } ## Test GO language is installed AND min version -if(!(Test-GO-Installed "1.19")) { exit 1 } +if(!(Test-GO-Installed "1.20")) { exit 1 } # Build erigon binaries Set-Variable -Name "Erigon" -Value ([hashtable]::Synchronized(@{})) -Scope Script