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.

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

Update to golang 1.22. #5036

Merged
merged 2 commits into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.21.11
1.22.4
8 changes: 4 additions & 4 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ linters-settings:

gosimple:
# Select the Go version to target. The default is '1.13'.
go: "1.21.11"
go: "1.22.4"

nakedret:
# make an issue if func has more lines of code than this setting and it has naked returns; default is 30
Expand All @@ -136,17 +136,17 @@ linters-settings:

staticcheck:
# Select the Go version to target. The default is '1.13'.
go: "1.21.11"
go: "1.22.4"
checks: ["all"]

stylecheck:
# Select the Go version to target. The default is '1.13'.
go: "1.21.11"
go: "1.22.4"
checks: ["all"]

unused:
# Select the Go version to target. The default is '1.13'.
go: "1.21.11"
go: "1.22.4"

gosec:
excludes:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG GO_VERSION=1.21.11
ARG GO_VERSION=1.22.4
FROM circleci/golang:${GO_VERSION}


Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.skaffold
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG GO_VERSION=1.21.11
ARG GO_VERSION=1.22.4
ARG crossbuild_image="docker.elastic.co/beats-dev/golang-crossbuild"
ARG AGENT_VERSION=8.9.0-SNAPSHOT
ARG AGENT_IMAGE="docker.elastic.co/beats/elastic-agent"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
kind: security

# Change summary; a 80ish characters long description of the change.
summary: Upgrade to Go 1.21.11.
summary: Upgrade to Go 1.22.4.

# Long description; in case the summary is not enough to describe the change
# this field accommodate a description without length limits.
Expand All @@ -25,7 +25,7 @@ component: "elastic-agent"
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
# Please provide it if you are adding a fragment for a different PR.
pr: https://github.com/elastic/elastic-agent/pull/4855
pr: https://github.com/elastic/elastic-agent/pull/5036

# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
# If not present is automatically filled by the tooling with the issue linked to the PR number.
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/elastic/elastic-agent

go 1.21.10
go 1.22.4

require (
github.com/Microsoft/go-winio v0.6.2
Expand Down
2 changes: 1 addition & 1 deletion version/docs/version.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// FIXME: once elastic.co docs have been switched over to use `main`, remove
// the `doc-site-branch` line below as well as any references to it in the code.
:doc-site-branch: master
:go-version: 1.21.11
:go-version: 1.22.4
:release-state: unreleased
:python: 3.7
:docker: 1.12
Expand Down