Skip to content

Commit 86e82ae

Browse files
authored
Revert "all: upgrade minimum Go version to 1.25 (#19109)" (#19212)
This reverts PR #19109 because test-hive CI jobs started to fail after it.
1 parent b62de40 commit 86e82ae

File tree

19 files changed

+139
-27
lines changed

19 files changed

+139
-27
lines changed

.github/workflows/manifest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- uses: actions/checkout@v6
2929
- uses: actions/setup-go@v6
3030
with:
31-
go-version: '1.25'
31+
go-version: '1.24'
3232
- run: make downloader
3333
- run: echo $ModModified
3434
- run: ./build/bin/downloader manifest-verify --chain mainnet --webseed 'https://erigon3-v1-snapshots-mainnet.erigon.network'

.github/workflows/test-hive-eest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
- name: Setup go env and cache
6767
uses: actions/setup-go@v6
6868
with:
69-
go-version: '>=1.25'
69+
go-version: '>=1.24'
7070

7171
# Targetting the clients/erigon/Dockerfile.git in the Hive director -
7272
# this builds the container from github and uses it for tests

.github/workflows/test-hive.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,6 @@ jobs:
5555
sim-limit: compat
5656
max-allowed-failures: 23
5757
steps:
58-
- name: Checkout Erigon go.mod
59-
uses: actions/checkout@v6
60-
with:
61-
sparse-checkout: go.mod
62-
path: erigon-src
63-
6458
- name: Checkout Hive
6559
uses: actions/checkout@v6
6660
with:
@@ -72,7 +66,7 @@ jobs:
7266
- name: Setup go env and cache
7367
uses: actions/setup-go@v6
7468
with:
75-
go-version: '>=1.25'
69+
go-version: '>=1.24'
7670
go-version-file: 'hive/go.mod'
7771

7872
- name: Conditional Docker Login
@@ -102,9 +96,6 @@ jobs:
10296
echo Building Hive with Erigon repo - ${SOURCE_REPO}, branch - $branch_name
10397
sed -i "s|^ARG github=erigontech/erigon$|ARG github=${SOURCE_REPO}|" clients/erigon/Dockerfile
10498
sed -i "s/^ARG tag=main$/ARG tag=${branch_name}/" clients/erigon/Dockerfile
105-
go_version=$(go mod edit -json ../erigon-src/go.mod | jq -r .Go)
106-
echo "Patching builder Go version to ${go_version}"
107-
sed -i "s|golang:[0-9.]*-alpine|golang:${go_version}-alpine|" clients/erigon/Dockerfile
10899
go build . >> buildlogs.log
109100
# Depends on the last line of hive output that prints the number of suites, tests and failed
110101
# Currently, we fail even if suites and tests are too few, indicating the tests did not run

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ default: all
112112

113113
## go-version: print and verify go version
114114
go-version:
115-
@if [ $(shell $(GO) version | cut -c 16-17) -lt 25 ]; then \
116-
echo "minimum required Golang version is 1.25"; \
115+
@if [ $(shell $(GO) version | cut -c 16-17) -lt 20 ]; then \
116+
echo "minimum required Golang version is 1.20"; \
117117
exit 1 ;\
118118
fi
119119

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Set `--prune.mode` to "archive" if you need an archive node or to "minimal" if y
7070
System Requirements
7171
===================
7272

73-
RAM: >=32GB, [Golang >= 1.25](https://golang.org/doc/install); GCC 10+ or Clang; On Linux: kernel > v4. 64-bit
73+
RAM: >=32GB, [Golang >= 1.24](https://golang.org/doc/install); GCC 10+ or Clang; On Linux: kernel > v4. 64-bit
7474
architecture.
7575

7676
- ArchiveNode Ethereum Mainnet: 1.6TB (May 2025). FullNode: 1.1TB (May 2025)
@@ -691,7 +691,7 @@ Windows users may run erigon in 3 possible ways:
691691
build on windows :
692692
* [Git](https://git-scm.com/downloads) for Windows must be installed (provides bash and MSYS2 environment). If
693693
you're cloning this repository is very likely you already have it
694-
* [GO Programming Language](https://golang.org/dl/) must be installed. Minimum required version is 1.25
694+
* [GO Programming Language](https://golang.org/dl/) must be installed. Minimum required version is 1.24
695695
* [Chocolatey package manager](https://chocolatey.org/) for Windows must be installed. Then install the required
696696
build tools: `choco install cmake make mingw` (provides GNU CC Compiler >= 13, GNU Make, and CMake). Make sure
697697
Windows System "Path" variable has:

agents.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
This file provides guidance for AI agents working with this codebase.
44

5-
**Requirements**: Go 1.25+, GCC 10+ or Clang, 32GB+ RAM, SSD/NVMe storage
5+
**Requirements**: Go 1.24+, GCC 10+ or Clang, 32GB+ RAM, SSD/NVMe storage
66

77
## Build & Test
88

common/crypto/blake2b/blake2bAVX2_amd64.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style
33
// license that can be found in the LICENSE file.
44

5-
//go:build amd64 && !gccgo && !appengine
5+
//go:build go1.7 && amd64 && !gccgo && !appengine
66

77
package blake2b
88

common/crypto/blake2b/blake2bAVX2_amd64.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style
33
// license that can be found in the LICENSE file.
44

5-
// +build amd64,!gccgo,!appengine
5+
// +build go1.7,amd64,!gccgo,!appengine
66

77
#include "textflag.h"
88

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// Copyright 2016 The Go Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style
3+
// license that can be found in the LICENSE file.
4+
5+
//go:build !go1.7 && amd64 && !gccgo && !appengine
6+
7+
package blake2b
8+
9+
import "golang.org/x/sys/cpu"
10+
11+
func init() {
12+
useSSE4 = cpu.X86.HasSSE41
13+
}
14+
15+
//go:noescape
16+
func fSSE4(h *[8]uint64, m *[16]uint64, c0, c1 uint64, flag uint64, rounds uint64)
17+
18+
func f(h *[8]uint64, m *[16]uint64, c0, c1 uint64, flag uint64, rounds uint64) {
19+
if useSSE4 {
20+
fSSE4(h, m, c0, c1, flag, rounds)
21+
} else {
22+
fGeneric(h, m, c0, c1, flag, rounds)
23+
}
24+
}

common/crypto/blake2b/register.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// Use of this source code is governed by a BSD-style
33
// license that can be found in the LICENSE file.
44

5+
//go:build go1.9
6+
57
package blake2b
68

79
import (

0 commit comments

Comments
 (0)