Skip to content

Commit

Permalink
build: bump go to 1.22 (#12835)
Browse files Browse the repository at this point in the history
* build: bump go to 1.22

* lint: run go mod tidy
  • Loading branch information
kruskall authored Mar 25, 2024
1 parent e9ff523 commit 6f7d4b7
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .go-version
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
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
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
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
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
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
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
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

0 comments on commit 6f7d4b7

Please sign in to comment.