From 87a893054d38c150789db3b15d6c9abb153c5092 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 13:44:52 -0400 Subject: [PATCH] [Automation] Bump Golang version to 1.21.11 (#4855) 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. --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Craig MacKenzie --- .go-version | 2 +- .golangci.yml | 8 ++++---- Dockerfile | 2 +- Dockerfile.skaffold | 2 +- ...1.21.10.yaml => 1712176768-Upgrade-to-Go-1.21.11.yaml} | 4 ++-- version/docs/version.asciidoc | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) rename changelog/fragments/{1712176768-Upgrade-to-Go-1.21.10.yaml => 1712176768-Upgrade-to-Go-1.21.11.yaml} (95%) diff --git a/.go-version b/.go-version index ae7bbdf047a..88863fd8e36 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.21.10 +1.21.11 diff --git a/.golangci.yml b/.golangci.yml index 07598c3c89a..71346681f33 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.10" + go: "1.21.11" 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.10" + go: "1.21.11" checks: ["all"] stylecheck: # Select the Go version to target. The default is '1.13'. - go: "1.21.10" + go: "1.21.11" checks: ["all"] unused: # Select the Go version to target. The default is '1.13'. - go: "1.21.10" + go: "1.21.11" gosec: excludes: diff --git a/Dockerfile b/Dockerfile index a135e7b2394..e586161e548 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.21.10 +ARG GO_VERSION=1.21.11 FROM circleci/golang:${GO_VERSION} diff --git a/Dockerfile.skaffold b/Dockerfile.skaffold index 5052607eb3d..c8ced4bd313 100644 --- a/Dockerfile.skaffold +++ b/Dockerfile.skaffold @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.21.10 +ARG GO_VERSION=1.21.11 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.10.yaml b/changelog/fragments/1712176768-Upgrade-to-Go-1.21.11.yaml similarity index 95% rename from changelog/fragments/1712176768-Upgrade-to-Go-1.21.10.yaml rename to changelog/fragments/1712176768-Upgrade-to-Go-1.21.11.yaml index 660a05e6ae4..bf98fd8e261 100644 --- a/changelog/fragments/1712176768-Upgrade-to-Go-1.21.10.yaml +++ b/changelog/fragments/1712176768-Upgrade-to-Go-1.21.11.yaml @@ -11,7 +11,7 @@ kind: security # Change summary; a 80ish characters long description of the change. -summary: Upgrade to Go 1.21.10. +summary: Upgrade to Go 1.21.11. # 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/4697 +pr: https://github.com/elastic/elastic-agent/pull/4855 # 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/version/docs/version.asciidoc b/version/docs/version.asciidoc index 70ff53bb247..39274d373b7 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.10 +:go-version: 1.21.11 :release-state: unreleased :python: 3.7 :docker: 1.12