v2: fix divergent changes #3036

Job	Run time
Prepare Go modules cache	16s
Smoke Tests	0s
macos-latest (AppSec disabled)	4m 11s
windows-latest (AppSec disabled)	7m 27s
ubuntu-latest-16-cores (AppSec disabled)	3m 18s
linux/amd64 golang:1.23-bookworm	3m 11s
linux/arm64 golang:1.23-bookworm	6m 8s
linux/amd64 golang:1.23-bullseye	3m 16s
macos-12 go1.23	13m 20s
linux/arm64 golang:1.23-bullseye	5m 16s
macos-12 go1.22	12m 8s
linux/amd64 golang:1.23-alpine	3m 32s
linux/arm64 golang:1.23-alpine	4m 49s
linux/amd64 golang:1.22-bookworm	3m 26s
macos-14 go1.23	9m 16s
linux/arm64 golang:1.22-bookworm	5m 19s
macos-14 go1.22	6m 50s
linux/amd64 golang:1.22-bullseye	3m 3s
linux/arm64 golang:1.22-bullseye	5m 5s
linux/amd64 golang:1.22-alpine	2m 44s
linux/arm64 golang:1.22-alpine	4m 51s
	1h 47m 26s

Provide feedback