From 762ac455ad695eecd9ebe3323f0a8ac09fc23831 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Thu, 9 May 2024 04:12:54 +1000 Subject: [PATCH] [Automation] Bump Golang version to 1.21.10 (#4697) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update from dockerfiles Made with ❤️️ by updatecli * chore: Update version.asciidoc Made with ❤️️ by updatecli * chore: Update .golangci.yml Made with ❤️️ by updatecli * chore: Update .go-version Made with ❤️️ by updatecli * Update changelog. * Add toolchain directive. --------- Co-authored-by: apmmachine Co-authored-by: Craig MacKenzie --- .go-version | 2 +- .golangci.yml | 8 ++++---- Dockerfile | 2 +- Dockerfile.skaffold | 2 +- ...-1.21.9.yaml => 1712176768-Upgrade-to-Go-1.21.10.yaml} | 4 ++-- go.mod | 2 +- version/docs/version.asciidoc | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) rename changelog/fragments/{1712176768-Upgrade-to-Go-1.21.9.yaml => 1712176768-Upgrade-to-Go-1.21.10.yaml} (95%) diff --git a/.go-version b/.go-version index f124bfa1554..ae7bbdf047a 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.21.9 +1.21.10 diff --git a/.golangci.yml b/.golangci.yml index 59c856f928c..07598c3c89a 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -116,7 +116,7 @@ linters-settings: gosimple: # Select the Go version to target. The default is '1.13'. - go: "1.21.9" + go: "1.21.10" nakedret: # make an issue if func has more lines of code than this setting and it has naked returns; default is 30 @@ -136,17 +136,17 @@ linters-settings: staticcheck: # Select the Go version to target. The default is '1.13'. - go: "1.21.9" + go: "1.21.10" checks: ["all"] stylecheck: # Select the Go version to target. The default is '1.13'. - go: "1.21.9" + go: "1.21.10" checks: ["all"] unused: # Select the Go version to target. The default is '1.13'. - go: "1.21.9" + go: "1.21.10" gosec: excludes: diff --git a/Dockerfile b/Dockerfile index 56e9350e409..a135e7b2394 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.21.9 +ARG GO_VERSION=1.21.10 FROM circleci/golang:${GO_VERSION} diff --git a/Dockerfile.skaffold b/Dockerfile.skaffold index d956c8bea37..5052607eb3d 100644 --- a/Dockerfile.skaffold +++ b/Dockerfile.skaffold @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.21.9 +ARG GO_VERSION=1.21.10 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" diff --git a/changelog/fragments/1712176768-Upgrade-to-Go-1.21.9.yaml b/changelog/fragments/1712176768-Upgrade-to-Go-1.21.10.yaml similarity index 95% rename from changelog/fragments/1712176768-Upgrade-to-Go-1.21.9.yaml rename to changelog/fragments/1712176768-Upgrade-to-Go-1.21.10.yaml index 776ca633128..660a05e6ae4 100644 --- a/changelog/fragments/1712176768-Upgrade-to-Go-1.21.9.yaml +++ b/changelog/fragments/1712176768-Upgrade-to-Go-1.21.10.yaml @@ -11,7 +11,7 @@ kind: security # Change summary; a 80ish characters long description of the change. -summary: Upgrade to Go 1.21.9. +summary: Upgrade to Go 1.21.10. # Long description; in case the summary is not enough to describe the change # this field accommodate a description without length limits. @@ -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/4508 +pr: https://github.com/elastic/elastic-agent/pull/4697 # 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. diff --git a/go.mod b/go.mod index a67f13844c6..fa66f243005 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/elastic/elastic-agent go 1.21.0 -toolchain go1.21.8 +toolchain go1.21.10 require ( github.com/Microsoft/go-winio v0.6.1 diff --git a/version/docs/version.asciidoc b/version/docs/version.asciidoc index 7063686109f..70ff53bb247 100644 --- a/version/docs/version.asciidoc +++ b/version/docs/version.asciidoc @@ -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.9 +:go-version: 1.21.10 :release-state: unreleased :python: 3.7 :docker: 1.12