Skip to content

Commit 96167af

Browse files
m-Peterm-Peter
committed
Revert to Go 1.25
1 parent b55eb23 commit 96167af

6 files changed

Lines changed: 17 additions & 17 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: CI
22

33
env:
4-
GO_VERSION: "1.26"
4+
GO_VERSION: "1.25"
55

66
on:
77
pull_request:
@@ -35,5 +35,5 @@ jobs:
3535
uses: golangci/golangci-lint-action@v8
3636
with:
3737
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
38-
version: v2.9.0
38+
version: v2.4
3939
args: --timeout=10m

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# BUILD BIN
22

3-
FROM golang:1.26 as app-builder
3+
FROM golang:1.25 as app-builder
44

55
# Build the app binary in /app
66
WORKDIR /app

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/onflow/flow-evm-gateway
22

3-
go 1.26.0
3+
go 1.25.1
44

55
require (
66
github.com/cockroachdb/pebble v1.1.5
@@ -11,7 +11,7 @@ require (
1111
github.com/holiman/uint256 v1.3.2
1212
github.com/onflow/atree v0.16.0
1313
github.com/onflow/cadence v1.10.3
14-
github.com/onflow/flow-go v0.48.1-evm-cache-block.0.20260624075610-65d6f283d095
14+
github.com/onflow/flow-go v0.48.1-evm-cache-block.0.20260625075712-10f911e681fa
1515
github.com/onflow/flow-go-sdk v1.10.3
1616
github.com/prometheus/client_golang v1.20.5
1717
github.com/rs/cors v1.8.0
@@ -142,7 +142,7 @@ require (
142142
github.com/multiformats/go-multistream v0.6.0 // indirect
143143
github.com/multiformats/go-varint v0.0.7 // indirect
144144
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
145-
github.com/onflow/crypto v0.26.0 // indirect
145+
github.com/onflow/crypto v0.25.4 // indirect
146146
github.com/onflow/fixed-point v0.1.1 // indirect
147147
github.com/onflow/flow-core-contracts/lib/go/contracts v1.10.3 // indirect
148148
github.com/onflow/flow-core-contracts/lib/go/templates v1.10.3 // indirect

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -557,8 +557,8 @@ github.com/onflow/atree v0.16.0 h1:b+f/suzcnnr1Lx1KdJEjpn2CX+AKSAz1yIB30NQDutU=
557557
github.com/onflow/atree v0.16.0/go.mod h1:hiOT/vKK/Zyw34Ru9OFbfEemC5NnQ7SHFB43bN9/4qI=
558558
github.com/onflow/cadence v1.10.3 h1:PJIIYKbaOT2DcZBnSO4O8ZF/Xc/fKV9vvOFLChgy85c=
559559
github.com/onflow/cadence v1.10.3/go.mod h1:tyUNaYlAgeQVgfR2C38MI1dtFFjKay+yGGPMrCRc068=
560-
github.com/onflow/crypto v0.26.0 h1:eXPnaxjMs91jYXgNU93OO1oACkQfzkB0Ce+hbJgaRFU=
561-
github.com/onflow/crypto v0.26.0/go.mod h1:nJgNMueICFD7F7fc2B7uX+Krpq9HQweWcU2GUmQrrM8=
560+
github.com/onflow/crypto v0.25.4 h1:R615PWPdSoA5RATNb/j3cYaloBIZlSXVNgS7BjwHiwM=
561+
github.com/onflow/crypto v0.25.4/go.mod h1:DlkW/1SPUvLHYvUcjWa9PkLIRgSBKR4EDc3i+ATQKW4=
562562
github.com/onflow/fixed-point v0.1.1 h1:j0jYZVO8VGyk1476alGudEg7XqCkeTVxb5ElRJRKS90=
563563
github.com/onflow/fixed-point v0.1.1/go.mod h1:gJdoHqKtToKdOZbvryJvDZfcpzC7d2fyWuo3ZmLtcGY=
564564
github.com/onflow/flow-core-contracts/lib/go/contracts v1.10.3 h1:OTJo6PzE8F0EtvBsBvXKVqSA8eCm1uzN+aWwV5gtjPs=
@@ -571,8 +571,8 @@ github.com/onflow/flow-ft/lib/go/contracts v1.1.1 h1:BNbP3CrTIgScpx2NS9snq9XDESF
571571
github.com/onflow/flow-ft/lib/go/contracts v1.1.1/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A=
572572
github.com/onflow/flow-ft/lib/go/templates v1.1.1 h1:X+EGTWKeVlsF33JD5QBFZLr8KW2apl6Oh1AXRWHmzLI=
573573
github.com/onflow/flow-ft/lib/go/templates v1.1.1/go.mod h1:uQ8XFqmMK2jxyBSVrmyuwdWjTEb+6zGjRYotfDJ5pAE=
574-
github.com/onflow/flow-go v0.48.1-evm-cache-block.0.20260624075610-65d6f283d095 h1:KkmU2X0gGN1/asLsqtvqKeOoKtQurEXxmhCfGTpzH4o=
575-
github.com/onflow/flow-go v0.48.1-evm-cache-block.0.20260624075610-65d6f283d095/go.mod h1:+IsK9Jp2h4+Blu0us7khzvAcIjX3i4dbyJY/wanL1jY=
574+
github.com/onflow/flow-go v0.48.1-evm-cache-block.0.20260625075712-10f911e681fa h1:8imxxVA07g680YFAzI6Ii5CnB1xPtgY/WvSat97Bwtw=
575+
github.com/onflow/flow-go v0.48.1-evm-cache-block.0.20260625075712-10f911e681fa/go.mod h1:EZoFMpnc+a57BXNkfgaq351+oeUXcfI14kxVoMh+Zoo=
576576
github.com/onflow/flow-go-sdk v1.10.3 h1:4zJYkdDNqeQqUJmdQJXlHIZuEjOLp8lsu8dRz5GZ/Cc=
577577
github.com/onflow/flow-go-sdk v1.10.3/go.mod h1:cnpuCUvKLGqVrhz6yPEv0+LdsT9ib+cbn0YxfAJxHEI=
578578
github.com/onflow/flow-nft/lib/go/contracts v1.4.1 h1:iQ8s4W5HNWd92MVRZbKxYpQ6UJn9snHLKQ9hFFNCiys=

‎tests/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
module github.com/onflow/flow-evm-gateway/integration
22

3-
go 1.26.0
3+
go 1.25.1
44

55
require (
66
github.com/ethereum/go-ethereum v1.17.4
77
github.com/goccy/go-json v0.10.4
88
github.com/onflow/cadence v1.10.3
9-
github.com/onflow/crypto v0.26.0
9+
github.com/onflow/crypto v0.25.4
1010
github.com/onflow/flow-emulator v1.21.1
1111
github.com/onflow/flow-evm-gateway v0.0.0-20240201154855-4d4d3d3f19c7
12-
github.com/onflow/flow-go v0.48.1-evm-cache-block.0.20260624075610-65d6f283d095
12+
github.com/onflow/flow-go v0.48.1-evm-cache-block.0.20260625075712-10f911e681fa
1313
github.com/onflow/flow-go-sdk v1.10.3
1414
github.com/rs/zerolog v1.34.0
1515
github.com/stretchr/testify v1.11.1

‎tests/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -805,8 +805,8 @@ github.com/onflow/atree v0.16.0 h1:b+f/suzcnnr1Lx1KdJEjpn2CX+AKSAz1yIB30NQDutU=
805805
github.com/onflow/atree v0.16.0/go.mod h1:hiOT/vKK/Zyw34Ru9OFbfEemC5NnQ7SHFB43bN9/4qI=
806806
github.com/onflow/cadence v1.10.3 h1:PJIIYKbaOT2DcZBnSO4O8ZF/Xc/fKV9vvOFLChgy85c=
807807
github.com/onflow/cadence v1.10.3/go.mod h1:tyUNaYlAgeQVgfR2C38MI1dtFFjKay+yGGPMrCRc068=
808-
github.com/onflow/crypto v0.26.0 h1:eXPnaxjMs91jYXgNU93OO1oACkQfzkB0Ce+hbJgaRFU=
809-
github.com/onflow/crypto v0.26.0/go.mod h1:nJgNMueICFD7F7fc2B7uX+Krpq9HQweWcU2GUmQrrM8=
808+
github.com/onflow/crypto v0.25.4 h1:R615PWPdSoA5RATNb/j3cYaloBIZlSXVNgS7BjwHiwM=
809+
github.com/onflow/crypto v0.25.4/go.mod h1:DlkW/1SPUvLHYvUcjWa9PkLIRgSBKR4EDc3i+ATQKW4=
810810
github.com/onflow/fixed-point v0.1.1 h1:j0jYZVO8VGyk1476alGudEg7XqCkeTVxb5ElRJRKS90=
811811
github.com/onflow/fixed-point v0.1.1/go.mod h1:gJdoHqKtToKdOZbvryJvDZfcpzC7d2fyWuo3ZmLtcGY=
812812
github.com/onflow/flow-core-contracts/lib/go/contracts v1.10.3 h1:OTJo6PzE8F0EtvBsBvXKVqSA8eCm1uzN+aWwV5gtjPs=
@@ -821,8 +821,8 @@ github.com/onflow/flow-ft/lib/go/contracts v1.1.1 h1:BNbP3CrTIgScpx2NS9snq9XDESF
821821
github.com/onflow/flow-ft/lib/go/contracts v1.1.1/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A=
822822
github.com/onflow/flow-ft/lib/go/templates v1.1.1 h1:X+EGTWKeVlsF33JD5QBFZLr8KW2apl6Oh1AXRWHmzLI=
823823
github.com/onflow/flow-ft/lib/go/templates v1.1.1/go.mod h1:uQ8XFqmMK2jxyBSVrmyuwdWjTEb+6zGjRYotfDJ5pAE=
824-
github.com/onflow/flow-go v0.48.1-evm-cache-block.0.20260624075610-65d6f283d095 h1:KkmU2X0gGN1/asLsqtvqKeOoKtQurEXxmhCfGTpzH4o=
825-
github.com/onflow/flow-go v0.48.1-evm-cache-block.0.20260624075610-65d6f283d095/go.mod h1:+IsK9Jp2h4+Blu0us7khzvAcIjX3i4dbyJY/wanL1jY=
824+
github.com/onflow/flow-go v0.48.1-evm-cache-block.0.20260625075712-10f911e681fa h1:8imxxVA07g680YFAzI6Ii5CnB1xPtgY/WvSat97Bwtw=
825+
github.com/onflow/flow-go v0.48.1-evm-cache-block.0.20260625075712-10f911e681fa/go.mod h1:EZoFMpnc+a57BXNkfgaq351+oeUXcfI14kxVoMh+Zoo=
826826
github.com/onflow/flow-go-sdk v1.10.3 h1:4zJYkdDNqeQqUJmdQJXlHIZuEjOLp8lsu8dRz5GZ/Cc=
827827
github.com/onflow/flow-go-sdk v1.10.3/go.mod h1:cnpuCUvKLGqVrhz6yPEv0+LdsT9ib+cbn0YxfAJxHEI=
828828
github.com/onflow/flow-nft/lib/go/contracts v1.4.1 h1:iQ8s4W5HNWd92MVRZbKxYpQ6UJn9snHLKQ9hFFNCiys=

0 commit comments

Comments
 (0)