Skip to content

Commit 984309f

Browse files
authored
Merge pull request #771 from sairaj18/bump-go-to-1.25.5
Update go version to 1.25.5 and logrus to 1.9.3
2 parents a9f2027 + 52bf550 commit 984309f

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
uses: actions/setup-go@v3
1414
with:
1515
# Go version needs to be the same in: CI config, README, Dockerfiles, and Makefile
16-
go-version: 1.25.3
16+
go-version: 1.25.5
1717
- name: Test
1818
run: |
1919
make check-fmt

.github/workflows/manual-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
uses: actions/setup-go@v3
4141
with:
4242
# Go version needs to be the same in: CI config, README, Dockerfiles, and Makefile
43-
go-version: 1.25.3
43+
go-version: 1.25.5
4444
- name: Set up QEMU
4545
uses: docker/setup-qemu-action@master
4646
with:

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ REGISTRY_NAME := docker-public.packages.atlassian.com
99
IMAGE_PREFIX := $(REGISTRY_NAME)/$(REPOSITORY_NAME)
1010
IMAGE_NAME := $(IMAGE_PREFIX)-$(CPU_ARCH)
1111
ARCH ?= $(shell uname -s | tr A-Z a-z)
12-
GOVERSION := 1.25.3 # Go version needs to be the same in: CI config, README, Dockerfiles, and Makefile
12+
GOVERSION := 1.25.5 # Go version needs to be the same in: CI config, README, Dockerfiles, and Makefile
1313
GP := /gopath
1414
MAIN_PKG := github.com/atlassian/gostatsd/cmd/gostatsd
1515
CLUSTER_PKG := github.com/atlassian/gostatsd/cmd/cluster

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ server based on load.
2424
Building the server
2525
-------------------
2626
[](# Go version needs to be the same in: CI config, README, Dockerfiles, and Makefile)
27-
Gostatsd currently targets Go 1.25.3. If you are compiling from source, please ensure you are running this version.
27+
Gostatsd currently targets Go 1.25.5. If you are compiling from source, please ensure you are running this version.
2828

2929
From the `gostatsd` directory run `make build`. The binary will be built in `build/bin/<arch>/gostatsd`.
3030

build/Dockerfile-multiarch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Go version needs to be the same in: CI config, README, Dockerfiles, and Makefile
2-
FROM golang:1.25.3 AS build
2+
FROM golang:1.25.5 AS build
33
WORKDIR /build
44

55
# Install dependencies first to take advantage of the docker build cache.

build/Dockerfile-multiarch-glibc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Go version needs to be the same in: CI config, README, Dockerfiles, and Makefile
2-
FROM golang:1.25.3 AS build
2+
FROM golang:1.25.5 AS build
33
WORKDIR /build
44

55
# Install dependencies first to take advantage of the docker build cache.

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/atlassian/gostatsd
22

3-
go 1.25.3
3+
go 1.25.5
44

55
require (
66
github.com/alicebob/miniredis/v2 v2.23.0
@@ -17,7 +17,7 @@ require (
1717
github.com/libp2p/go-reuseport v0.2.0
1818
github.com/magiconair/properties v1.8.7
1919
github.com/pierrec/lz4/v4 v4.1.19
20-
github.com/sirupsen/logrus v1.9.0
20+
github.com/sirupsen/logrus v1.9.3
2121
github.com/spf13/pflag v1.0.6
2222
github.com/spf13/viper v1.17.0
2323
github.com/stretchr/testify v1.9.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ github.com/sagikazarmark/locafero v0.3.0 h1:zT7VEGWC2DTflmccN/5T1etyKvxSxpHsjb9c
207207
github.com/sagikazarmark/locafero v0.3.0/go.mod h1:w+v7UsPNFwzF1cHuOajOOzoq4U7v/ig1mpRjqV+Bu1U=
208208
github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
209209
github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
210-
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
211-
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
210+
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
211+
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
212212
github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
213213
github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
214214
github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=

0 commit comments

Comments
 (0)