Skip to content

Commit 1f2938c

Browse files
mergify[bot]github-actions[bot]cmacknz
authored
[7.17](backport #42681) [Automation] Bump Golang version to 1.22.12 (#42683)
* [Automation] Bump Golang version to 1.22.12 (#42681) * chore: Update Metricbeat Dockerfile Made with ❤️️ by updatecli * chore: Update HTTP module Dockerfile Made with ❤️️ by updatecli * chore: Update stan Dockerfile Made with ❤️️ by updatecli * chore: Update Heartbeat Dockerfile Made with ❤️️ by updatecli * chore: Update .golangci.yml Made with ❤️️ by updatecli * chore: Update Filebeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update Packetbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Heartbeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update NATS module Dockerfile Made with ❤️️ by updatecli * chore: Update Metricbeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update .go-version Made with ❤️️ by updatecli * chore: Update Auditbeat Dockerfile Made with ❤️️ by updatecli * chore: Update from vsphere Dockerfile Made with ❤️️ by updatecli * chore: Update go.mod Made with ❤️️ by updatecli * Add changelog. --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co> (cherry picked from commit c156390) # Conflicts: # dev-tools/kubernetes/heartbeat/Dockerfile.debug # go.mod * Fix conflicts * Fix changelog conflicts * Update all Dockerfiles. --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>
1 parent a69b506 commit 1f2938c

File tree

20 files changed

+23
-22
lines changed

20 files changed

+23
-22
lines changed

Diff for: ‎.go-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.22.10
1+
1.22.12

Diff for: ‎.golangci.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ linters-settings:
100100

101101
gosimple:
102102
# Select the Go version to target. The default is '1.13'.
103-
go: "1.22.10"
103+
go: "1.22.12"
104104

105105
nakedret:
106106
# make an issue if func has more lines of code than this setting and it has naked returns; default is 30
@@ -118,19 +118,19 @@ linters-settings:
118118

119119
staticcheck:
120120
# Select the Go version to target. The default is '1.13'.
121-
go: "1.22.10"
121+
go: "1.22.12"
122122
checks: ["all"]
123123

124124
stylecheck:
125125
# Select the Go version to target. The default is '1.13'.
126-
go: "1.22.10"
126+
go: "1.22.12"
127127
# Disabled:
128128
# ST1005: error strings should not be capitalized
129129
checks: ["all", "-ST1005"]
130130

131131
unused:
132132
# Select the Go version to target. The default is '1.13'.
133-
go: "1.22.10"
133+
go: "1.22.12"
134134

135135
gosec:
136136
excludes:

Diff for: ‎CHANGELOG.next.asciidoc

+1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
6868

6969
*Affecting all Beats*
7070

71+
- Update to Go 1.22.12. {pull}42681[42681]
7172

7273
*Auditbeat*
7374

Diff for: ‎auditbeat/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.10
1+
FROM golang:1.22.12
22

33
RUN \
44
apt-get update \

Diff for: ‎dev-tools/kubernetes/filebeat/Dockerfile.debug

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.10 as builder
1+
FROM golang:1.22.12 as builder
22

33
ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin
44

Diff for: ‎dev-tools/kubernetes/heartbeat/Dockerfile.debug

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.10 as builder
1+
FROM golang:1.22.12 as builder
22

33
ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin
44

Diff for: ‎dev-tools/kubernetes/metricbeat/Dockerfile.debug

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.10 as builder
1+
FROM golang:1.22.12 as builder
22

33
ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin
44

Diff for: ‎filebeat/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.10
1+
FROM golang:1.22.12
22

33
RUN \
44
apt-get update \

Diff for: ‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/elastic/beats/v7
22

3-
go 1.22.0
3+
go 1.22.12
44

55
require (
66
cloud.google.com/go/bigquery v1.59.1

Diff for: ‎heartbeat/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.10
1+
FROM golang:1.22.12
22

33
RUN \
44
apt-get update \

Diff for: ‎libbeat/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.10
1+
FROM golang:1.22.12
22

33
RUN \
44
apt-get update \

Diff for: ‎libbeat/docs/version.asciidoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
:stack-version: 7.17.27
22
:doc-branch: 7.17
3-
:go-version: 1.22.10
3+
:go-version: 1.22.12
44
:release-state: unreleased
55
:python: 3.7
66
:docker: 1.12

Diff for: ‎metricbeat/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.10
1+
FROM golang:1.22.12
22
COPY --from=docker:26.0.0-alpine3.19 /usr/local/bin/docker /usr/local/bin/
33

44
RUN \

Diff for: ‎metricbeat/module/http/_meta/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.10
1+
FROM golang:1.22.12
22

33
COPY test/main.go main.go
44

Diff for: ‎metricbeat/module/nats/_meta/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ARG NATS_VERSION=2.0.4
22
FROM nats:$NATS_VERSION
33

44
# build stage
5-
FROM golang:1.22.10 AS build-env
5+
FROM golang:1.22.12 AS build-env
66
RUN apt-get install git mercurial gcc
77
RUN git clone https://github.com/nats-io/nats.go.git /nats-go
88
RUN cd /nats-go/examples/nats-bench && git checkout tags/v1.10.0 && go build .

Diff for: ‎metricbeat/module/vsphere/_meta/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG VSPHERE_GOLANG_VERSION
2-
FROM golang:1.22.10
2+
FROM golang:1.22.12
33

44
RUN apt-get install curl git
55
RUN go install github.com/vmware/govmomi/vcsim@v0.30.4

Diff for: ‎packetbeat/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.10
1+
FROM golang:1.22.12
22

33
RUN \
44
apt-get update \

Diff for: ‎x-pack/functionbeat/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.10
1+
FROM golang:1.22.12
22

33
RUN \
44
apt-get update \

Diff for: ‎x-pack/libbeat/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.10
1+
FROM golang:1.22.12
22

33
RUN \
44
apt-get update \

Diff for: ‎x-pack/metricbeat/module/stan/_meta/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ARG STAN_VERSION=0.15.1
22
FROM nats-streaming:$STAN_VERSION
33

44
# build stage
5-
FROM golang:1.22.10 AS build-env
5+
FROM golang:1.22.12 AS build-env
66
RUN apt-get install git mercurial gcc
77
RUN git clone https://github.com/nats-io/stan.go.git /stan-go
88
RUN cd /stan-go/examples/stan-bench && git checkout tags/v0.5.2 && go build .

0 commit comments

Comments
 (0)