Skip to content

Commit 142b1d7

Browse files
authored
Merge pull request #775 from sairaj18/bump-go-version-to-1.26.0
Update go version to 1.26.0 and apline to 3.23.3
2 parents 0699517 + 399b90c commit 142b1d7

File tree

10 files changed

+11
-11
lines changed

10 files changed

+11
-11
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.5
16+
go-version: 1.26.0
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.5
43+
go-version: 1.26.0
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.5 # Go version needs to be the same in: CI config, README, Dockerfiles, and Makefile
12+
GOVERSION := 1.26.0 # 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.5. If you are compiling from source, please ensure you are running this version.
27+
Gostatsd currently targets Go 1.26.0. 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

bin/darwin/amd64/gostatsd

1.19 MB
Binary file not shown.

build/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.21.3
1+
FROM alpine:3.23.3
22

33
RUN apk --no-cache add \
44
ca-certificates

build/Dockerfile-multiarch

Lines changed: 2 additions & 2 deletions
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.5 AS build
2+
FROM golang:1.26.0 AS build
33
WORKDIR /build
44

55
# Install dependencies first to take advantage of the docker build cache.
@@ -22,7 +22,7 @@ RUN CGO_ENABLED=0 GOARCH=${TARGETARCH} \
2222
-X main.BuildDate=$(date +%Y-%m-%d-%H:%M)" \
2323
${MAIN_PKG}
2424

25-
FROM alpine:3.21.3
25+
FROM alpine:3.23.3
2626

2727
RUN apk --no-cache add \
2828
ca-certificates

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.5 AS build
2+
FROM golang:1.26.0 AS build
33
WORKDIR /build
44

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

go.mod

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

3-
go 1.25.5
3+
go 1.26.0
44

55
require (
66
github.com/alicebob/miniredis/v2 v2.23.0

pkg/statsd/parser_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func TestParseDatagram(t *testing.T) {
110110
}
111111
for i, e := range ch.events {
112112
if e.DateHappened <= 0 {
113-
t.Errorf("%q: DateHappened should be positive", e)
113+
t.Errorf("%v: DateHappened should be positive", e)
114114
}
115115
ch.events[i].DateHappened = 0
116116
}
@@ -217,7 +217,7 @@ func TestParseDatagramIgnoreHost(t *testing.T) {
217217
metrics, _, _ := mr.handleDatagram(context.Background(), lex(), 0, fakeIP, []byte(datagram))
218218
for i, e := range ch.events {
219219
if e.DateHappened <= 0 {
220-
t.Errorf("%q: DateHappened should be positive", e)
220+
t.Errorf("%v: DateHappened should be positive", e)
221221
}
222222
ch.events[i].DateHappened = 0
223223
}

0 commit comments

Comments
 (0)