Merge pull request #7821 from onflow/peter/update-go-1.25

peterargue · web-flow · commit 6a937823bdc3 · 2025-09-04T18:46:13.000Z
Update go to 1.25
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ on:
       - master
 
 env:
-  GO_VERSION: "1.23"
+  GO_VERSION: "1.25"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
diff --git a/.github/workflows/flaky-test-monitor.yml b/.github/workflows/flaky-test-monitor.yml
@@ -13,7 +13,7 @@ permissions:
   contents: read
 
 env:
-  GO_VERSION: "1.23"
+  GO_VERSION: "1.25"
   BIGQUERY_DATASET: dev_src_flow_test_metrics
   BIGQUERY_TABLE: skipped_tests
   BIGQUERY_TABLE2: test_results
diff --git a/.github/workflows/image_builds.yml b/.github/workflows/image_builds.yml
@@ -16,7 +16,7 @@ on:
         type: string
 
 env:
-  GO_VERSION: "1.23"
+  GO_VERSION: "1.25"
   PRIVATE_REGISTRY_HOST: us-central1-docker.pkg.dev
 
 jobs:
diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml
@@ -14,7 +14,7 @@ on:
         type: boolean
 
 env:
-  GO_VERSION: "1.23"
+  GO_VERSION: "1.25"
 
 jobs:
   build-publish:
diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ The following table lists all work streams and links to their home directory and
 ## Installation
 
 - Clone this repository
-- Install [Go](https://golang.org/doc/install) (Flow requires Go 1.23 and later)
+- Install [Go](https://golang.org/doc/install) (Flow requires Go 1.25 and later)
 - Install [Docker](https://docs.docker.com/get-docker/), which is used for running a local network and integration tests
 - Make sure the [`GOPATH`](https://golang.org/cmd/go/#hdr-GOPATH_environment_variable) and `GOBIN` environment variables
   are set, and `GOBIN` is added to your path:
diff --git a/cmd/Dockerfile b/cmd/Dockerfile
@@ -3,7 +3,7 @@
 
 ####################################
 ## (1) Setup the build environment
-FROM golang:1.23-bullseye AS build-setup
+FROM golang:1.25-bookworm AS build-setup
 
 RUN apt-get update
 RUN apt-get -y install zip apt-utils gcc-aarch64-linux-gnu
@@ -85,7 +85,7 @@ RUN --mount=type=ssh \
 RUN chmod a+x /app/app
 
 ## (4) Add the statically linked debug binary to a distroless image configured for debugging
-FROM golang:1.23-bullseye as debug
+FROM golang:1.25-bookworm as debug
 
 RUN go install github.com/go-delve/delve/cmd/dlv@latest
 
diff --git a/crypto/go.mod b/crypto/go.mod
@@ -1,4 +1,4 @@
 // Deprecated: The latest supported version is v0.25.0. The module then migrated to github.com/onflow/crypto. Use the new module github.com/onflow/crypto instead.
 module github.com/onflow/flow-go/crypto
 
-go 1.23
+go 1.25
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/onflow/flow-go
 
-go 1.23.7
+go 1.25.0
 
 require (
 	cloud.google.com/go/compute/metadata v0.7.0
diff --git a/insecure/go.mod b/insecure/go.mod
@@ -1,6 +1,6 @@
 module github.com/onflow/flow-go/insecure
 
-go 1.23.7
+go 1.25.0
 
 require (
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2
diff --git a/integration/benchmark/cmd/manual/Dockerfile b/integration/benchmark/cmd/manual/Dockerfile
@@ -1,7 +1,7 @@
 # syntax = docker/dockerfile:experimental
 # NOTE: Must be run in the context of the repo's root directory
 
-FROM golang:1.23-bullseye AS build-setup
+FROM golang:1.25-bookworm AS build-setup
 
 RUN apt-get update
 RUN apt-get -y install zip
diff --git a/integration/go.mod b/integration/go.mod
@@ -1,6 +1,6 @@
 module github.com/onflow/flow-go/integration
 
-go 1.23.7
+go 1.25.0
 
 require (
 	cloud.google.com/go/bigquery v1.67.0
diff --git a/integration/localnet/client/Dockerfile b/integration/localnet/client/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23
+FROM golang:1.25
 
 COPY flow-localnet.json /go
 
diff --git a/tools/structwrite/go.mod b/tools/structwrite/go.mod
@@ -1,8 +1,6 @@
 module github.com/onflow/flow-go/tools/structwrite
 
-go 1.23.0
-
-toolchain go1.24.2
+go 1.25.0
 
 require (
 	github.com/golangci/plugin-module-register v0.1.1
diff --git a/tools/structwrite/structwrite.go b/tools/structwrite/structwrite.go
@@ -6,6 +6,7 @@ import (
 	"go/types"
 	"regexp"
 	"strings"
+	"sync"
 
 	"github.com/golangci/plugin-module-register/register"
 	"golang.org/x/tools/go/analysis"
@@ -65,6 +66,8 @@ type PluginStructWrite struct {
 	mutationProtected map[string]struct{}
 	// Regex of constructor function names, where mutation is allowed.
 	constructorRegex *regexp.Regexp
+
+	mu sync.RWMutex
 }
 
 // New creates a new instance of the PluginStructWrite plugin.
@@ -143,7 +146,7 @@ func (p *PluginStructWrite) gatherMutationProtectedTypes(pass *analysis.Pass) {
 							typeObj := pass.TypesInfo.Defs[typeSpec.Name]
 							if named, ok := typeObj.Type().(*types.Named); ok {
 								fullyQualified := named.String()
-								p.mutationProtected[fullyQualified] = struct{}{}
+								p.setMutationProtected(fullyQualified)
 							}
 							break
 						}
@@ -242,10 +245,19 @@ func (p *PluginStructWrite) handleCompositeLit(lit *ast.CompositeLit, pass *anal
 
 // isMutationProtected checks whether a fully qualified type is configured to be mutation-protected.
 func (p *PluginStructWrite) isMutationProtected(fullyQualifiedTypeName string) bool {
+	p.mu.RLock()
+	defer p.mu.RUnlock()
 	_, ok := p.mutationProtected[fullyQualifiedTypeName]
 	return ok
 }
 
+// setMutationProtected sets a fully qualified type as mutation-protected.
+func (p *PluginStructWrite) setMutationProtected(fullyQualifiedTypeName string) {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	p.mutationProtected[fullyQualifiedTypeName] = struct{}{}
+}
+
 // containsTrackedStruct checks whether the field accessed via selector expression belongs to a tracked struct,
 // either directly or via embedding.
 func (p *PluginStructWrite) containsTrackedStruct(selExpr *ast.SelectorExpr, pass *analysis.Pass) (*types.Named, bool) {

-Original file line number
+Diff line change
@@ @@ -1,4 +1,4 @@ @@
 // Deprecated: The latest supported version is v0.25.0. The module then migrated to github.com/onflow/crypto. Use the new module github.com/onflow/crypto instead.
 module github.com/onflow/flow-go/crypto
 -go 1.23
 +go 1.25