Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: bump go version to 1.21.3 #11821

Merged
merged 6 commits into from
Oct 11, 2023
Merged

build: bump go version to 1.21.3 #11821

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
34ebb63
build: bump go version
kruskall Oct 10, 2023
35011bf
build: also bump systemtest go toolchain version
kruskall Oct 10, 2023
8b69dc3
ci: update script to also set the toolchain version
kruskall Oct 10, 2023
0135d60
build: bump gmux
kruskall Oct 11, 2023
fa70dec
build: run go mod tidy
kruskall Oct 11, 2023
4098fa4
build: generate notice file
kruskall Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .go-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.21.2
1.21.3
2 changes: 1 addition & 1 deletion cmd/intake-receiver/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/elastic/apm-server/cmd/intake-receiver

go 1.21

toolchain go1.21.1
toolchain go1.21.3

require (
github.com/stretchr/testify v1.6.1
Expand Down
2 changes: 1 addition & 1 deletion docs/version.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// doc-branch can be: master, 8.0, 8.1, etc.
:doc-branch: master
:go-version: 1.21.2
:go-version: 1.21.3
:python: 3.7
:docker: 1.12
:docker-compose: 1.11
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/elastic/apm-server

go 1.21

toolchain go1.21.1
toolchain go1.21.3

require (
github.com/cespare/xxhash/v2 v2.2.0
Expand Down
2 changes: 1 addition & 1 deletion internal/glog/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ module github.com/golang/glog

go 1.21

toolchain go1.21.1
toolchain go1.21.3
2 changes: 1 addition & 1 deletion packaging/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG BASE_IMAGE=ubuntu:20.04

# Build the apm-server binary. The golang image version is kept
# up to date with go.mod by Makefile.
FROM golang:1.21.2 as builder
FROM golang:1.21.3 as builder
WORKDIR /src
COPY go.mod go.sum /src/
COPY internal/glog/go.mod /src/internal/glog/go.mod
Expand Down
5 changes: 5 additions & 0 deletions script/update_go_version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,8 @@ echo $GOVERSION > .go-version
sed -i "s/golang:[[:digit:]]\+\(\.[[:digit:]]\+\)\{1,2\}/golang:$GOVERSION/" packaging/docker/Dockerfile
sed -i "s/^:go-version:.*/:go-version: $GOVERSION/" docs/version.asciidoc
sed -i "s/\(\[Go\]\[golang-download\]\) [[:digit:]].*/\1 $GOMOD_VERSION.x/" README.md
sed -i "s/toolchain go[[:digit:]]\+\(\.[[:digit:]]\+\)\{1,2\}/toolchain go$GOVERSION/" tools/go.mod
sed -i "s/toolchain go[[:digit:]]\+\(\.[[:digit:]]\+\)\{1,2\}/toolchain go$GOVERSION/" internal/glog/go.mod
sed -i "s/toolchain go[[:digit:]]\+\(\.[[:digit:]]\+\)\{1,2\}/toolchain go$GOVERSION/" go.mod
sed -i "s/toolchain go[[:digit:]]\+\(\.[[:digit:]]\+\)\{1,2\}/toolchain go$GOVERSION/" systemtest/go.mod
sed -i "s/toolchain go[[:digit:]]\+\(\.[[:digit:]]\+\)\{1,2\}/toolchain go$GOVERSION/" cmd/intake-receiver/go.mod
Comment on lines +23 to +27
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably follow up by using find -name go.mod

2 changes: 1 addition & 1 deletion systemtest/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/elastic/apm-server/systemtest

go 1.21

toolchain go1.21.1
toolchain go1.21.3

require (
github.com/docker/docker v23.0.3+incompatible
Expand Down
4 changes: 3 additions & 1 deletion tools/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
module github.com/elastic/apm-server/tools

go 1.21.1
go 1.21

toolchain go1.21.3

require (
github.com/elastic/apm-tools v0.0.0-20230828065051-3f799314cc8b
Expand Down
Loading