Skip to content

Commit 04c44e4

Browse files
authored
security(daemon): upgrade golang to 1.25.1 (#1116)
Co-authored-by: Michal Nowacki <[email protected]> who added go version check and go autoupdate.
1 parent 8b29533 commit 04c44e4

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

Makefile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ GCOV ?= gcov
1010
SHELL = /bin/bash
1111
GCOVR ?= gcovr
1212
GIT ?= git
13+
# make sure go toolchain defined in daemon/go.mod is always used
14+
GOTOOLCHAIN=auto
1315

1416
include make/config.mk
1517
include make/vendor.mk
@@ -165,9 +167,17 @@ agent-valgrind: agent/Makefile
165167
# Configure the target directory for go install
166168
export GOBIN=$(CURDIR)/bin
167169

170+
.PHONY: daemon-golang-verify
171+
daemon-golang-verify:
172+
@golang_in_binary=$$(go version -m bin/daemon | awk '/^bin\/daemon/ {print $$2;}') \
173+
&& golang_from_toolchain=$$(awk '/^toolchain/ {print $$2;}' daemon/go.mod) \
174+
&& [ "$$golang_in_binary" = "$$golang_from_toolchain" ] && echo "daemon built using: $$golang_from_toolchain" \
175+
|| { echo "ERROR: daemon built using go: $$golang_in_binary, required: $$golang_from_toolchain"; exit 1; }
176+
168177
.PHONY: daemon
169178
daemon:
170179
$(MAKE) -C daemon
180+
$(MAKE) daemon-golang-verify
171181

172182
.PHONY: daemon_race
173183
daemon_race:

daemon/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module github.com/newrelic/newrelic-php-agent/daemon
22

33
go 1.24.0
4-
toolchain go1.24.4
4+
toolchain go1.25.1
55

66
require (
77
github.com/golang/protobuf v1.5.3

0 commit comments

Comments
 (0)