From c7b17ca4fd1f2b8273f2fa904a682b69a58ab3a0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 28 Jan 2025 15:31:47 -0800 Subject: [PATCH 1/2] [Automation] Bump Golang version to 1.23.5 (#4353) 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 * Add Changelog --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: michel-laterman (cherry picked from commit baed4595648a0fefe2391aa58de940076e7b1747) # Conflicts: # .go-version # .golangci.yml --- .go-version | 4 +++ .golangci.yml | 4 +++ .../1738103621-Bump-go-to-v1.23.5.yaml | 32 +++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 changelog/fragments/1738103621-Bump-go-to-v1.23.5.yaml diff --git a/.go-version b/.go-version index 49e0a31d4..4252cc285 100644 --- a/.go-version +++ b/.go-version @@ -1 +1,5 @@ +<<<<<<< HEAD 1.23.1 +======= +1.23.5 +>>>>>>> baed459 ([Automation] Bump Golang version to 1.23.5 (#4353)) diff --git a/.golangci.yml b/.golangci.yml index 16b28eb6f..797073c25 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -3,7 +3,11 @@ run: # timeout for analysis, e.g. 30s, 5m, default is 1m timeout: 1m build-tags: integration +<<<<<<< HEAD go: "1.23.1" +======= + go: "1.23.5" +>>>>>>> baed459 ([Automation] Bump Golang version to 1.23.5 (#4353)) issues: # Maximum count of issues with the same text. diff --git a/changelog/fragments/1738103621-Bump-go-to-v1.23.5.yaml b/changelog/fragments/1738103621-Bump-go-to-v1.23.5.yaml new file mode 100644 index 000000000..326f60b3b --- /dev/null +++ b/changelog/fragments/1738103621-Bump-go-to-v1.23.5.yaml @@ -0,0 +1,32 @@ +# Kind can be one of: +# - breaking-change: a change to previously-documented behavior +# - deprecation: functionality that is being removed in a later release +# - bug-fix: fixes a problem in a previous version +# - enhancement: extends functionality but does not break or fix existing behavior +# - feature: new functionality +# - known-issue: problems that we are aware of in a given version +# - security: impacts on the security of a product or a user’s deployment. +# - upgrade: important information for someone upgrading from a prior version +# - other: does not fit into any of the other categories +kind: enhancement + +# Change summary; a 80ish characters long description of the change. +summary: Bump go to v1.23.5 + +# 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: + +# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc. +component: fleet-server + +# PR URL; optional; the PR number that added the changeset. +# 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/fleet-server/pull/4353 + +# 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. +#issue: https://github.com/owner/repo/1234 From 2593d37dfddd734e91941049487598168ba2534a Mon Sep 17 00:00:00 2001 From: michel-laterman Date: Tue, 28 Jan 2025 15:40:21 -0800 Subject: [PATCH 2/2] Fix merge --- .go-version | 4 ---- .golangci.yml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/.go-version b/.go-version index 4252cc285..ca8ec414e 100644 --- a/.go-version +++ b/.go-version @@ -1,5 +1 @@ -<<<<<<< HEAD -1.23.1 -======= 1.23.5 ->>>>>>> baed459 ([Automation] Bump Golang version to 1.23.5 (#4353)) diff --git a/.golangci.yml b/.golangci.yml index 797073c25..198058836 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -3,11 +3,7 @@ run: # timeout for analysis, e.g. 30s, 5m, default is 1m timeout: 1m build-tags: integration -<<<<<<< HEAD - go: "1.23.1" -======= go: "1.23.5" ->>>>>>> baed459 ([Automation] Bump Golang version to 1.23.5 (#4353)) issues: # Maximum count of issues with the same text.