From ab30cd27aed42f7ce35324aeee0ced9053c599af Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Fri, 5 Apr 2024 16:16:45 -0400 Subject: [PATCH] [Automation] Bump Golang version to 1.21.9 (#4508) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update .golangci.yml Made with ❤️️ by updatecli * chore: Update .go-version Made with ❤️️ by updatecli * chore: Update from dockerfiles Made with ❤️️ by updatecli * chore: Update version.asciidoc Made with ❤️️ by updatecli * Add changelog entry. * Remove 1.21.8 changelog entry. --------- Co-authored-by: apmmachine Co-authored-by: Craig MacKenzie --- .go-version | 2 +- .golangci.yml | 8 ++++---- Dockerfile | 2 +- Dockerfile.skaffold | 2 +- ...o-1.21.8.yaml => 1712176768-Upgrade-to-Go-1.21.9.yaml} | 6 +++--- version/docs/version.asciidoc | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) rename changelog/fragments/{1704304944-Upgrade-to-Go-1.21.8.yaml => 1712176768-Upgrade-to-Go-1.21.9.yaml} (90%) diff --git a/.go-version b/.go-version index 428abfd24fb..f124bfa1554 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.21.8 +1.21.9 diff --git a/.golangci.yml b/.golangci.yml index 8fa3c93173c..59c856f928c 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.8" + go: "1.21.9" 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.8" + go: "1.21.9" checks: ["all"] stylecheck: # Select the Go version to target. The default is '1.13'. - go: "1.21.8" + go: "1.21.9" checks: ["all"] unused: # Select the Go version to target. The default is '1.13'. - go: "1.21.8" + go: "1.21.9" gosec: excludes: diff --git a/Dockerfile b/Dockerfile index b9d91c6565f..56e9350e409 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.21.8 +ARG GO_VERSION=1.21.9 FROM circleci/golang:${GO_VERSION} diff --git a/Dockerfile.skaffold b/Dockerfile.skaffold index 0b0cac33caf..d956c8bea37 100644 --- a/Dockerfile.skaffold +++ b/Dockerfile.skaffold @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.21.8 +ARG GO_VERSION=1.21.9 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/1704304944-Upgrade-to-Go-1.21.8.yaml b/changelog/fragments/1712176768-Upgrade-to-Go-1.21.9.yaml similarity index 90% rename from changelog/fragments/1704304944-Upgrade-to-Go-1.21.8.yaml rename to changelog/fragments/1712176768-Upgrade-to-Go-1.21.9.yaml index 4ceb59d5439..776ca633128 100644 --- a/changelog/fragments/1704304944-Upgrade-to-Go-1.21.8.yaml +++ b/changelog/fragments/1712176768-Upgrade-to-Go-1.21.9.yaml @@ -11,12 +11,12 @@ kind: security # Change summary; a 80ish characters long description of the change. -summary: Upgrade to Go 1.21.8 +summary: Upgrade to Go 1.21.9. # Long description; in case the summary is not enough to describe the change # this field accommodate a description without length limits. # NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment. -description: Removes support for Windows 8.1. See https://tip.golang.org/doc/go1.21#windows. +#description: # Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc. component: "elastic-agent" @@ -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/4361 +pr: https://github.com/elastic/elastic-agent/pull/4508 # 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 4416ed67036..7063686109f 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.8 +:go-version: 1.21.9 :release-state: unreleased :python: 3.7 :docker: 1.12