Skip to content

Commit

Permalink
[Automation] Bump Golang version to 1.20.10 (#36846)
Browse files Browse the repository at this point in the history
* chore: Update version.asciidoc

Made with ❤️️ by updatecli

* chore: Update Packetbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update Heartbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update Filebeat debug Dockerfile

Made with ❤️️ by updatecli

* chore: Update Functionbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update Auditbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update from vsphere Dockerfile

Made with ❤️️ by updatecli

* chore: Update stan Dockerfile

Made with ❤️️ by updatecli

* chore: Update .golangci.yml

Made with ❤️️ by updatecli

* chore: Update Heartbeat debug Dockerfile

Made with ❤️️ by updatecli

* chore: Update Metricbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update Metricbeat debug Dockerfile

Made with ❤️️ by updatecli

* chore: Update .go-version

Made with ❤️️ by updatecli

* chore: Update HTTP module Dockerfile

Made with ❤️️ by updatecli

* chore: Update NATS module Dockerfile

Made with ❤️️ by updatecli

* Add changelog.

---------

Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>
Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>
(cherry picked from commit 6be0d18)

# Conflicts:
#	libbeat/docs/version.asciidoc
  • Loading branch information
apmmachine authored and mergify[bot] committed Oct 16, 2023
1 parent 2c05dfa commit 3ccc71c
Show file tree
Hide file tree
Showing 16 changed files with 24 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.20.8
1.20.10
8 changes: 4 additions & 4 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ linters-settings:

gosimple:
# Select the Go version to target. The default is '1.13'.
go: "1.20.8"
go: "1.20.10"

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

staticcheck:
# Select the Go version to target. The default is '1.13'.
go: "1.20.8"
go: "1.20.10"
checks: ["all"]

stylecheck:
# Select the Go version to target. The default is '1.13'.
go: "1.20.8"
go: "1.20.10"
# Disabled:
# ST1005: error strings should not be capitalized
checks: ["all", "-ST1005"]

unused:
# Select the Go version to target. The default is '1.13'.
go: "1.20.8"
go: "1.20.10"

gosec:
excludes:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]

*Affecting all Beats*

- Upgrade to Go 1.20.10. {pull}36846[36846]
- Added append Processor which will append concrete values or values from a field to target. {issue}29934[29934] {pull}33364[33364]

*Auditbeat*
Expand Down
2 changes: 1 addition & 1 deletion auditbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.8
FROM golang:1.20.10

RUN \
apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/kubernetes/filebeat/Dockerfile.debug
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.8 as builder
FROM golang:1.20.10 as builder

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

Expand Down
2 changes: 1 addition & 1 deletion dev-tools/kubernetes/heartbeat/Dockerfile.debug
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.8 as builder
FROM golang:1.20.10 as builder

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

Expand Down
2 changes: 1 addition & 1 deletion dev-tools/kubernetes/metricbeat/Dockerfile.debug
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.8 as builder
FROM golang:1.20.10 as builder

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

Expand Down
2 changes: 1 addition & 1 deletion heartbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.8
FROM golang:1.20.10

RUN \
apt-get update \
Expand Down
6 changes: 6 additions & 0 deletions libbeat/docs/version.asciidoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
<<<<<<< HEAD
:stack-version: 8.10.3
:doc-branch: 8.10
:go-version: 1.20.8
=======
:stack-version: 8.11.0
:doc-branch: main
:go-version: 1.20.10
>>>>>>> 6be0d18448 ([Automation] Bump Golang version to 1.20.10 (#36846))
:release-state: unreleased
:python: 3.7
:docker: 1.12
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.8
FROM golang:1.20.10

RUN \
apt update \
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/http/_meta/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.8
FROM golang:1.20.10

COPY test/main.go main.go

Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/nats/_meta/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG NATS_VERSION=2.0.4
FROM nats:$NATS_VERSION

# build stage
FROM golang:1.20.8 AS build-env
FROM golang:1.20.10 AS build-env
RUN apt-get install git mercurial gcc
RUN git clone https://github.com/nats-io/nats.go.git /nats-go
RUN cd /nats-go/examples/nats-bench && git checkout tags/v1.10.0 && go build .
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/vsphere/_meta/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG VSPHERE_GOLANG_VERSION
FROM golang:1.20.8
FROM golang:1.20.10

RUN apt-get install curl git
RUN go install github.com/vmware/govmomi/vcsim@v0.30.4
Expand Down
2 changes: 1 addition & 1 deletion packetbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.8
FROM golang:1.20.10

RUN \
apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion x-pack/functionbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.8
FROM golang:1.20.10

RUN \
apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion x-pack/metricbeat/module/stan/_meta/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG STAN_VERSION=0.15.1
FROM nats-streaming:$STAN_VERSION

# build stage
FROM golang:1.20.8 AS build-env
FROM golang:1.20.10 AS build-env
RUN apt-get install git mercurial gcc
RUN git clone https://github.com/nats-io/stan.go.git /stan-go
RUN cd /stan-go/examples/stan-bench && git checkout tags/v0.5.2 && go build .
Expand Down

0 comments on commit 3ccc71c

Please sign in to comment.