[Automation] Bump Golang version to 1.22.11 (#6663)

* chore: Update version.asciidoc Made with ❤️️ by updatecli * chore: Update .golangci.yml Made with ❤️️ by updatecli * chore: Update from dockerfiles Made with ❤️️ by updatecli * chore: Update go.mod version Made with ❤️️ by updatecli --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> (cherry picked from commit 3145177) # Conflicts: # .golangci.yml # Dockerfile # Dockerfile.skaffold # go.mod # version/docs/version.asciidoc
elastic · Jan 31, 2025 · 55d95bc · 55d95bc
1 parent c78777d
commit 55d95bc
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 0 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -120,7 +120,11 @@ linters-settings:
 
   gosimple:
     # Select the Go version to target. The default is '1.13'.
+<<<<<<< HEAD
     go: "1.22.9"
+=======
+    go: "1.22.11"
+>>>>>>> 3145177fd ([Automation] Bump Golang version to 1.22.11 (#6663))
 
   nolintlint:
     # Enable to ensure that nolint directives are all used. Default is true.
@@ -136,17 +140,29 @@ linters-settings:
 
   staticcheck:
     # Select the Go version to target. The default is '1.13'.
+<<<<<<< HEAD
     go: "1.22.9"
+=======
+    go: "1.22.11"
+>>>>>>> 3145177fd ([Automation] Bump Golang version to 1.22.11 (#6663))
     checks: ["all"]
 
   stylecheck:
     # Select the Go version to target. The default is '1.13'.
+<<<<<<< HEAD
     go: "1.22.9"
+=======
+    go: "1.22.11"
+>>>>>>> 3145177fd ([Automation] Bump Golang version to 1.22.11 (#6663))
     checks: ["all"]
 
   unused:
     # Select the Go version to target. The default is '1.13'.
+<<<<<<< HEAD
     go: "1.22.9"
+=======
+    go: "1.22.11"
+>>>>>>> 3145177fd ([Automation] Bump Golang version to 1.22.11 (#6663))
 
   gosec:
     excludes:

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 ARG GO_VERSION=1.22.9
+=======
+ARG GO_VERSION=1.22.11
+>>>>>>> 3145177fd ([Automation] Bump Golang version to 1.22.11 (#6663))
 FROM circleci/golang:${GO_VERSION}
 
 

diff --git a/Dockerfile.skaffold b/Dockerfile.skaffold
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 ARG GO_VERSION=1.22.9
+=======
+ARG GO_VERSION=1.22.11
+>>>>>>> 3145177fd ([Automation] Bump Golang version to 1.22.11 (#6663))
 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/go.mod b/go.mod
@@ -1,6 +1,10 @@
 module github.com/elastic/elastic-agent
 
+<<<<<<< HEAD
 go 1.22.8
+=======
+go 1.22.11
+>>>>>>> 3145177fd ([Automation] Bump Golang version to 1.22.11 (#6663))
 
 require (
 	github.com/Jeffail/gabs/v2 v2.6.0

diff --git a/version/docs/version.asciidoc b/version/docs/version.asciidoc
@@ -3,7 +3,11 @@
 // 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
+<<<<<<< HEAD
 :go-version: 1.22.9
+=======
+:go-version: 1.22.11
+>>>>>>> 3145177fd ([Automation] Bump Golang version to 1.22.11 (#6663))
 :release-state: unreleased
 :python: 3.7
 :docker: 1.12