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 to 1.22 #12835

Merged
merged 7 commits into from
Mar 25, 2024
Merged

build: bump go to 1.22 #12835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
366d8a1
build: bump go to 1.22
kruskall Mar 21, 2024
5a109f1
lint: run go mod tidy
kruskall Mar 21, 2024
f7266b0
Merge branch 'main' into feat/go1.22
kruskall Mar 21, 2024
fbfcb2d
Merge branch 'main' into feat/go1.22
kruskall Mar 22, 2024
e9c3861
build: bump .go-version to 1.22.0
kruskall Mar 22, 2024
7e7ac44
feat: bump go to 1.22.1
kruskall Mar 22, 2024
5b1e9fa
Merge branch 'main' into feat/go1.22
kruskall Mar 25, 2024
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.7
1.22.1
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ To get started with APM, see our [Quick start guide](https://www.elastic.co/guid

### Requirements

* [Go][golang-download] 1.21.x
* [Go][golang-download] 1.22.x

[golang-download]: https://golang.org/dl/

Expand Down
4 changes: 2 additions & 2 deletions cmd/intake-receiver/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/elastic/apm-server/cmd/intake-receiver

go 1.21
go 1.22

toolchain go1.21.3
toolchain go1.22.1

require (
github.com/stretchr/testify v1.6.1
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/elastic/apm-server

go 1.21
go 1.22

toolchain go1.21.3
toolchain go1.22.1

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

go 1.21
go 1.22

toolchain go1.21.3
toolchain go1.22.1
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:22.04

# Build the apm-server binary. The golang image version is kept
# up to date with go.mod by Makefile.
FROM golang:1.21.7 as builder
FROM golang:1.22.1 as builder
WORKDIR /src
COPY go.mod go.sum /src/
COPY internal/glog/go.mod /src/internal/glog/go.mod
Expand Down
4 changes: 2 additions & 2 deletions systemtest/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/elastic/apm-server/systemtest

go 1.21
go 1.22

toolchain go1.21.3
toolchain go1.22.1

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

go 1.21.0
go 1.22

toolchain go1.21.3
toolchain go1.22.1

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