From 3f9ee79caa2d83bb6957a9d622de89e34ac7d7a0 Mon Sep 17 00:00:00 2001 From: Shawn Burke Date: Wed, 10 Dec 2025 07:56:19 +1100 Subject: [PATCH] Upgrade go to 1.25.5 --- .github/workflows/ci.yml | 4 ++-- agent/Makefile | 2 +- agent/go.mod | 4 ++-- agent/go.sum | 4 ++-- agent/test/relay/docker-compose.yml | 2 +- docker/Dockerfile | 2 +- examples/go/axon-ev-sync/go.mod | 2 +- examples/go/axon-ev-sync/go.sum | 4 ++-- scaffold/go/axon_client/go.mod | 4 ++-- scaffold/go/axon_client/go.sum | 4 ++-- scaffold/go/go.mod | 2 +- sdks/go/go.mod | 4 ++-- sdks/go/go.sum | 4 ++-- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a9b3a7e..e7a3a6f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: '1.24.8' + go-version: '1.25.5' - name: Install dependencies run: | @@ -50,7 +50,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: '1.24.8' + go-version: '1.25.5' - name: Install dependencies run: | diff --git a/agent/Makefile b/agent/Makefile index 432bc91..8caf507 100644 --- a/agent/Makefile +++ b/agent/Makefile @@ -49,7 +49,7 @@ build: mockgen: mkdir -p test/mocks - @if ! command -v $(GOBIN)/mockgen >/dev/null; then echo "Installing mockgen..."; go install go.uber.org/mock/mockgen@v0.5.0; fi + @if ! command -v $(GOBIN)/mockgen >/dev/null; then echo "Installing mockgen..."; go install go.uber.org/mock/mockgen@v0.6.0; fi .PHONY: mockgen server/http/http_server_mock.go: server/http/http_server.go diff --git a/agent/go.mod b/agent/go.mod index ad5b7bf..a280963 100644 --- a/agent/go.mod +++ b/agent/go.mod @@ -1,6 +1,6 @@ module github.com/cortexapps/axon -go 1.24.8 +go 1.25.5 require ( github.com/google/uuid v1.6.0 @@ -10,7 +10,7 @@ require ( github.com/spf13/cobra v1.8.1 github.com/stretchr/testify v1.10.0 go.uber.org/fx v1.23.0 - go.uber.org/mock v0.5.0 + go.uber.org/mock v0.6.0 go.uber.org/zap v1.27.0 google.golang.org/grpc v1.68.0 google.golang.org/protobuf v1.36.6 diff --git a/agent/go.sum b/agent/go.sum index cbe838f..28aa1d6 100644 --- a/agent/go.sum +++ b/agent/go.sum @@ -52,8 +52,8 @@ go.uber.org/fx v1.23.0 h1:lIr/gYWQGfTwGcSXWXu4vP5Ws6iqnNEIY+F/aFzCKTg= go.uber.org/fx v1.23.0/go.mod h1:o/D9n+2mLP6v1EG+qsdT1O8wKopYAsqZasju97SDFCU= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= -go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU= -go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM= +go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y= +go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= diff --git a/agent/test/relay/docker-compose.yml b/agent/test/relay/docker-compose.yml index cd18439..7ec18b8 100644 --- a/agent/test/relay/docker-compose.yml +++ b/agent/test/relay/docker-compose.yml @@ -64,7 +64,7 @@ services: stop_grace_period: 1s # SIGKILL after 1s cortex-fake: - image: golang:1.24-alpine + image: golang:1.25-alpine volumes: - .:/src environment: diff --git a/docker/Dockerfile b/docker/Dockerfile index 44842f4..b8930e9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -10,7 +10,7 @@ ARG SNYK_BROKER_VERSION=4.203.4 RUN wget -q -O - https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash - && apt install -y nodejs RUN npm install -g snyk-broker@${SNYK_BROKER_VERSION} -ENV GOLANG_VERSION=1.24.8 +ENV GOLANG_VERSION=1.25.5 # Install Go, this script will work for ARM or AMD64 RUN wget -q -O /tmp/goinstall.sh https://raw.githubusercontent.com/canha/golang-tools-install-script/master/goinstall.sh && chmod +x /tmp/goinstall.sh && /tmp/goinstall.sh --version ${GOLANG_VERSION} diff --git a/examples/go/axon-ev-sync/go.mod b/examples/go/axon-ev-sync/go.mod index 19e1804..0998839 100644 --- a/examples/go/axon-ev-sync/go.mod +++ b/examples/go/axon-ev-sync/go.mod @@ -1,6 +1,6 @@ module github.com/cortexapps/axon_apps/axon-ev-sync -go 1.24.8 +go 1.25.5 require ( github.com/cortexapps/axon-go v0.0.0 diff --git a/examples/go/axon-ev-sync/go.sum b/examples/go/axon-ev-sync/go.sum index 662aa78..460cbdf 100644 --- a/examples/go/axon-ev-sync/go.sum +++ b/examples/go/axon-ev-sync/go.sum @@ -12,8 +12,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= -go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU= -go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM= +go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y= +go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU= go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= diff --git a/scaffold/go/axon_client/go.mod b/scaffold/go/axon_client/go.mod index 19dee58..e5ed0eb 100644 --- a/scaffold/go/axon_client/go.mod +++ b/scaffold/go/axon_client/go.mod @@ -1,11 +1,11 @@ module github.com/cortexapps/axon-go -go 1.24.8 +go 1.25.5 require ( github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.uber.org/mock v0.5.0 + go.uber.org/mock v0.6.0 go.uber.org/zap v1.27.0 google.golang.org/grpc v1.68.0 google.golang.org/protobuf v1.36.0 diff --git a/scaffold/go/axon_client/go.sum b/scaffold/go/axon_client/go.sum index a4f0cf1..97427e1 100644 --- a/scaffold/go/axon_client/go.sum +++ b/scaffold/go/axon_client/go.sum @@ -12,8 +12,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= -go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU= -go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM= +go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y= +go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU= go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= diff --git a/scaffold/go/go.mod b/scaffold/go/go.mod index 135d334..9d9a0f5 100644 --- a/scaffold/go/go.mod +++ b/scaffold/go/go.mod @@ -1,6 +1,6 @@ module github.com/cortexapps/axon_apps/{{.ProjectName}} -go 1.24.8 +go 1.25.5 require ( github.com/google/uuid v1.6.0 diff --git a/sdks/go/go.mod b/sdks/go/go.mod index 19dee58..e5ed0eb 100644 --- a/sdks/go/go.mod +++ b/sdks/go/go.mod @@ -1,11 +1,11 @@ module github.com/cortexapps/axon-go -go 1.24.8 +go 1.25.5 require ( github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.uber.org/mock v0.5.0 + go.uber.org/mock v0.6.0 go.uber.org/zap v1.27.0 google.golang.org/grpc v1.68.0 google.golang.org/protobuf v1.36.0 diff --git a/sdks/go/go.sum b/sdks/go/go.sum index a4f0cf1..97427e1 100644 --- a/sdks/go/go.sum +++ b/sdks/go/go.sum @@ -12,8 +12,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= -go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU= -go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM= +go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y= +go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU= go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=