Update go.mod to v1.25.1. (#15740)

* Updated go.mod to v1.25.1.

Run `golangci-lint migrate`
GolangCI lint: Add `noinlineerr`.
Run `golangci-lint run --config=.golangci.yml`.
`golangci`: Add `--new`.

* `go.yml`: Added `fetch-depth: 0` to have something working with merge queue according to

https://github.com/golangci/golangci-lint-action/issues/956

---------

Co-authored-by: james-prysm <90280386+james-prysm@users.noreply.github.com>
This commit is contained in:
Manu NALEPA
2025-09-24 21:57:17 +02:00
committed by GitHub
parent 58ce1c25f5
commit 8fa956036a
6 changed files with 57 additions and 44 deletions

View File

@@ -1,4 +1,4 @@
FROM golang:1.24-alpine FROM golang:1.25.1-alpine
COPY entrypoint.sh /entrypoint.sh COPY entrypoint.sh /entrypoint.sh

View File

@@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/setup-go@v4 - uses: actions/setup-go@v4
with: with:
go-version: '1.23.5' go-version: '1.25.1'
- id: list - id: list
uses: shogo82148/actions-go-fuzz/list@v0 uses: shogo82148/actions-go-fuzz/list@v0
with: with:
@@ -36,7 +36,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/setup-go@v4 - uses: actions/setup-go@v4
with: with:
go-version: '1.23.5' go-version: '1.25.1'
- uses: shogo82148/actions-go-fuzz/run@v0 - uses: shogo82148/actions-go-fuzz/run@v0
with: with:
packages: ${{ matrix.package }} packages: ${{ matrix.package }}

View File

@@ -31,7 +31,7 @@ jobs:
- name: Set up Go 1.24 - name: Set up Go 1.24
uses: actions/setup-go@v4 uses: actions/setup-go@v4
with: with:
go-version: '1.24.0' go-version: '1.25.1'
- name: Run Gosec Security Scanner - name: Run Gosec Security Scanner
run: | # https://github.com/securego/gosec/issues/469 run: | # https://github.com/securego/gosec/issues/469
export PATH=$PATH:$(go env GOPATH)/bin export PATH=$PATH:$(go env GOPATH)/bin
@@ -44,27 +44,28 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Set up Go 1.24
uses: actions/setup-go@v4
with: with:
go-version: '1.24.0' fetch-depth: 0
id: go
- name: Set up Go 1.25.1
uses: actions/setup-go@v5
with:
go-version: '1.25.1'
- name: Golangci-lint - name: Golangci-lint
uses: golangci/golangci-lint-action@v5 uses: golangci/golangci-lint-action@v8
with: with:
version: v1.64.5 version: v2.4
args: --config=.golangci.yml --out-${NO_FUTURE}format colored-line-number only-new-issues: true
build: build:
name: Build name: Build
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Set up Go 1.x - name: Set up Go 1.25.1
uses: actions/setup-go@v4 uses: actions/setup-go@v4
with: with:
go-version: '1.24.0' go-version: '1.25.1'
id: go id: go
- name: Check out code into the Go module directory - name: Check out code into the Go module directory

View File

@@ -1,22 +1,9 @@
version: "2"
run: run:
timeout: 10m go: 1.23.5
go: '1.23.5'
issues:
exclude-files:
- validator/web/site_data.go
- .*_test.go
exclude-dirs:
- proto
- tools/analyzers
linters: linters:
enable-all: true default: all
disable: disable:
# Deprecated linters:
- govet
# Disabled for now:
- asasalint - asasalint
- bodyclose - bodyclose
- containedctx - containedctx
@@ -26,14 +13,13 @@ linters:
- dogsled - dogsled
- dupl - dupl
- durationcheck - durationcheck
- errname
- err113 - err113
- errname
- exhaustive - exhaustive
- exhaustruct - exhaustruct
- forbidigo - forbidigo
- forcetypeassert - forcetypeassert
- funlen - funlen
- gci
- gochecknoglobals - gochecknoglobals
- gochecknoinits - gochecknoinits
- goconst - goconst
@@ -41,9 +27,9 @@ linters:
- gocyclo - gocyclo
- godot - godot
- godox - godox
- gofumpt
- gomoddirectives - gomoddirectives
- gosec - gosec
- govet
- inamedparam - inamedparam
- interfacebloat - interfacebloat
- intrange - intrange
@@ -58,6 +44,7 @@ linters:
- nilnil - nilnil
- nlreturn - nlreturn
- noctx - noctx
- noinlineerr
- nolintlint - nolintlint
- nonamedreturns - nonamedreturns
- nosprintfhostport - nosprintfhostport
@@ -70,7 +57,6 @@ linters:
- revive - revive
- spancheck - spancheck
- staticcheck - staticcheck
- stylecheck
- tagalign - tagalign
- tagliatelle - tagliatelle
- thelper - thelper
@@ -79,12 +65,35 @@ linters:
- varnamelen - varnamelen
- wrapcheck - wrapcheck
- wsl - wsl
settings:
linters-settings:
gocognit: gocognit:
# TODO: We should target for < 50
min-complexity: 65 min-complexity: 65
exclusions:
output: generated: lax
print-issued-lines: true presets:
sort-results: true - comments
- common-false-positives
- legacy
- std-error-handling
paths:
- validator/web/site_data.go
- .*_test.go
- proto
- tools/analyzers
- third_party$
- builtin$
- examples$
formatters:
enable:
- gofmt
- goimports
exclusions:
generated: lax
paths:
- validator/web/site_data.go
- .*_test.go
- proto
- tools/analyzers
- third_party$
- builtin$
- examples$

View File

@@ -0,0 +1,3 @@
### Changed
- Updated go.mod to v1.25.1

2
go.mod
View File

@@ -1,6 +1,6 @@
module github.com/OffchainLabs/prysm/v6 module github.com/OffchainLabs/prysm/v6
go 1.24.5 go 1.25.1
require ( require (
github.com/MariusVanDerWijden/FuzzyVM v0.0.0-20240516070431-7828990cad7d github.com/MariusVanDerWijden/FuzzyVM v0.0.0-20240516070431-7828990cad7d