Skip to content

Commit 2b16cce

Browse files
Backport of build: update toolchain to Go 1.25.2 into release/1.10.x (#26912)
Co-authored-by: Tim Gross <[email protected]>
1 parent 03985e0 commit 2b16cce

File tree

7 files changed

+9
-8
lines changed

7 files changed

+9
-8
lines changed

.changelog/26909.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:security
2+
build: Update toolchain to Go 1.25.2 to address Go stdlib CVE-2025-61724, CVE-2025-61725, CVE-2025-58187, CVE-2025-61723, CVE-2025-47912, CVE-2025-58185, CVE-2025-58186, CVE-2025-58188, and CVE-2025-58183
3+
```

.go-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.25.1
1+
1.25.2

contributing/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ A development environment is supplied via Vagrant to make getting started easier
3333

3434
Developing without Vagrant
3535
---
36-
1. Install [Go 1.25.1+](https://golang.org/) *(Note: `gcc-go` is not supported)*
36+
1. Install [Go 1.25.2+](https://golang.org/) *(Note: `gcc-go` is not supported)*
3737
1. Clone this repo
3838
```sh
3939
$ git clone https://github.com/hashicorp/nomad.git

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/hashicorp/nomad
22

3-
go 1.25.1
3+
go 1.25.2
44

55
// Pinned dependencies are noted in github.com/hashicorp/nomad/issues/11826.
66
replace (

helper/ipaddr/ipaddr_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func TestNormalizeAddr(t *testing.T) {
118118
},
119119
"ipv4 invalid URL": {
120120
addr: "https://[10.10.1.10]:8200",
121-
expected: "https://10.10.1.10:8200",
121+
expected: "https://[10.10.1.10]:8200",
122122
},
123123
"ipv4 destination address": {
124124
@@ -251,8 +251,6 @@ func TestNormalizeAddr(t *testing.T) {
251251
},
252252
}
253253
for name, tc := range tests {
254-
name := name
255-
tc := tc
256254
t.Run(name, func(t *testing.T) {
257255
t.Parallel()
258256
must.Eq(t, tc.expected, NormalizeAddr(tc.addr))

scripts/linux-priv-go.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ case $(arch) in
2121
esac
2222

2323
function install_go() {
24-
local go_version="1.25.1"
24+
local go_version="1.25.2"
2525
local download="https://storage.googleapis.com/golang/go${go_version}.linux-${ARCH}.tar.gz"
2626

2727
if go version 2>&1 | grep -q "${go_version}"; then

scripts/release/mac-remote-build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ REPO_PATH="${TMP_WORKSPACE}/gopath/src/github.com/hashicorp/nomad"
5656
mkdir -p "${TMP_WORKSPACE}/tmp"
5757
5858
install_go() {
59-
local go_version="1.25.1"
59+
local go_version="1.25.2"
6060
local download=
6161
6262
download="https://storage.googleapis.com/golang/go${go_version}.darwin-amd64.tar.gz"

0 commit comments

Comments
 (0)