Skip to content

Commit

Permalink
go.mod: minimal go version 1.20 (erigontech#8495)
Browse files Browse the repository at this point in the history
Because 1.19 is not working anymore.
  • Loading branch information
battlmonstr authored Oct 16, 2023
1 parent 9e42b70 commit 911da43
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.debian
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

<code>🔬 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).</code>
Expand Down Expand Up @@ -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`)
Expand Down
2 changes: 1 addition & 1 deletion cmd/release/go.mod
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion erigon-lib/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion erigon-lib/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/ledgerwatch/erigon

go 1.19
go 1.20

require (
github.com/erigontech/mdbx-go v0.27.17
Expand Down
2 changes: 1 addition & 1 deletion wmake.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 911da43

Please sign in to comment.