Skip to content

Commit

Permalink
Go 1.18 drop (erigontech#7159)
Browse files Browse the repository at this point in the history
  • Loading branch information
AskAlexSharov authored and calmbeing committed Apr 24, 2023
1 parent 7117ef2 commit 6d522ae
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 18 deletions.
22 changes: 12 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- run: git submodule update --init --recursive --force
- uses: actions/setup-go@v4
with:
go-version: 1.19.x
go-version: '1.19'
- name: Install dependencies on Linux
if: runner.os == 'Linux'
run: sudo apt update && sudo apt install build-essential
Expand Down Expand Up @@ -68,9 +69,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- run: git submodule update --init --recursive --force
- uses: actions/setup-go@v4
with:
go-version: 1.19.x
go-version: '1.19'

- uses: actions/cache@v3
with:
Expand Down Expand Up @@ -107,11 +109,11 @@ jobs:
run: sudo DOCKER_TAG=thorax/erigon:ci-$GITHUB_SHA DOCKER_UID=$(id -u) DOCKER_GID=$(id -g) make docker

automated-tests:
runs-on:
ubuntu-20.04
if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }}
steps:
- uses: actions/checkout@v3
- name: run automated testing
run: BUILD_ERIGON=1 ./tests/automated-testing/run.sh
runs-on:
ubuntu-20.04
if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }}
steps:
- uses: actions/checkout@v3

- name: run automated testing
run: BUILD_ERIGON=1 ./tests/automated-testing/run.sh
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 18 ]; then \
echo "minimum required Golang version is 1.18"; \
@if [ $(shell $(GO) version | cut -c 16-17) -lt 19 ]; then \
echo "minimum required Golang version is 1.19"; \
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 @@ -63,7 +63,7 @@ Bear in mind that SSD performance deteriorates when close to capacity.

RAM: >=16GB, 64-bit architecture.

[Golang version >= 1.18](https://golang.org/doc/install); GCC 10+ or Clang; On Linux: kernel > v4
[Golang version >= 1.19](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 @@ -202,7 +202,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.18
* [GO Programming Language](https://golang.org/dl/) must be installed. Minimum required version is 1.19
* 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 go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/ledgerwatch/erigon
go 1.19

require (
github.com/ledgerwatch/erigon-lib v0.0.0-20230322070724-03ec6600f1e3
github.com/ledgerwatch/erigon-lib v0.0.0-20230322093023-a96278eab6af
github.com/ledgerwatch/erigon-snapshot v1.1.1-0.20230306083105-1391330d62a3
github.com/ledgerwatch/log/v3 v3.7.0
github.com/ledgerwatch/secp256k1 v1.0.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -519,8 +519,8 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/kylelemons/godebug v0.0.0-20170224010052-a616ab194758 h1:0D5M2HQSGD3PYPwICLl+/9oulQauOuETfgFvhBDffs0=
github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c=
github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8=
github.com/ledgerwatch/erigon-lib v0.0.0-20230322070724-03ec6600f1e3 h1:lYaUIn8v3LeV85Z0QUJuyJZZvMbmbud7ERwiC9NQDp8=
github.com/ledgerwatch/erigon-lib v0.0.0-20230322070724-03ec6600f1e3/go.mod h1:I+1Oys00tH9C8Ow1u5atjh3XasMPE4VoAG5lq8Bi1Zs=
github.com/ledgerwatch/erigon-lib v0.0.0-20230322093023-a96278eab6af h1:uZlF8RSPFcT1zlT15k8+7bCiz4HxETNWslQCc7gC5ws=
github.com/ledgerwatch/erigon-lib v0.0.0-20230322093023-a96278eab6af/go.mod h1:y8BVxpDgTzPDyodwGtXfBA4l7h3GOoivdSMHWBDoChw=
github.com/ledgerwatch/erigon-snapshot v1.1.1-0.20230306083105-1391330d62a3 h1:tfzawK1gIIgRjVZeANXOr0Ziu+kqCIBuKMe0TXfl5Aw=
github.com/ledgerwatch/erigon-snapshot v1.1.1-0.20230306083105-1391330d62a3/go.mod h1:3AuPxZc85jkehh/HA9h8gabv5MSi3kb/ddtzBsTVJFo=
github.com/ledgerwatch/log/v3 v3.7.0 h1:aFPEZdwZx4jzA3+/Pf8wNDN5tCI0cIolq/kfvgcM+og=
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.18")) { exit 1 }
if(!(Test-GO-Installed "1.19")) { exit 1 }

# Build erigon binaries
Set-Variable -Name "Erigon" -Value ([hashtable]::Synchronized(@{})) -Scope Script
Expand Down

0 comments on commit 6d522ae

Please sign in to comment.