Skip to content

Commit

Permalink
[8.9] Bump Golang version to 1.19.12 (#36246)
Browse files Browse the repository at this point in the history
* [Automation] Bump Golang version to 1.20.7 (#36241)

* chore: changed lines [1] of file "/tmp/updatecli/github/elastic/beats...

... /metricbeat/module/http/_meta/Dockerfile"

Made with ❤️️ by updatecli

* chore: changed lines [1] of file "/tmp/updatecli/github/elastic/beats...

... /dev-tools/kubernetes/filebeat/Dockerfile.debug"

Made with ❤️️ by updatecli

* chore: changed lines [1] of file "/tmp/updatecli/github/elastic/beats...

... /metricbeat/Dockerfile"

Made with ❤️️ by updatecli

* chore: changed lines [1] of file "/tmp/updatecli/github/elastic/beats...

... /x-pack/functionbeat/Dockerfile"

Made with ❤️️ by updatecli

* chore: changed lines [2] of file "/tmp/updatecli/github/elastic/beats...

... /metricbeat/module/vsphere/_meta/Dockerfile"

Made with ❤️️ by updatecli

* chore: changed lines [1] of file "/tmp/updatecli/github/elastic/beats...

... /dev-tools/kubernetes/metricbeat/Dockerfile.debug"

Made with ❤️️ by updatecli

* chore: Updated to content ":go-version: 1.20.7" in file "libbeat/docs...

... /version.asciidoc"

Made with ❤️️ by updatecli

* chore: Updated to content "go 1.20" in file "go.mod"

Made with ❤️️ by updatecli

* chore: changed lines [5] of file "/tmp/updatecli/github/elastic/beats...

... /x-pack/metricbeat/module/stan/_meta/Dockerfile"

Made with ❤️️ by updatecli

* chore: Updated to content "1.20.7" in file ".golangci.yml"

Made with ❤️️ by updatecli

* chore: changed lines [1] of file "/tmp/updatecli/github/elastic/beats...

... /auditbeat/Dockerfile"

Made with ❤️️ by updatecli

* chore: changed lines [1] of file "/tmp/updatecli/github/elastic/beats...

... /heartbeat/Dockerfile"

Made with ❤️️ by updatecli

* chore: changed lines [5] of file "/tmp/updatecli/github/elastic/beats...

... /metricbeat/module/nats/_meta/Dockerfile"

Made with ❤️️ by updatecli

* chore: Updated to content "1.20.7" in file ".go-version"

Made with ❤️️ by updatecli

* chore: changed lines [1] of file "/tmp/updatecli/github/elastic/beats...

... /dev-tools/kubernetes/heartbeat/Dockerfile.debug"

Made with ❤️️ by updatecli

* chore: changed lines [1] of file "/tmp/updatecli/github/elastic/beats...

... /packetbeat/Dockerfile"

Made with ❤️️ by updatecli

* Update changelog.

---------

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

# Conflicts:
#	.go-version
#	.golangci.yml
#	auditbeat/Dockerfile
#	dev-tools/kubernetes/filebeat/Dockerfile.debug
#	dev-tools/kubernetes/heartbeat/Dockerfile.debug
#	dev-tools/kubernetes/metricbeat/Dockerfile.debug
#	heartbeat/Dockerfile
#	libbeat/docs/version.asciidoc
#	metricbeat/Dockerfile
#	metricbeat/module/http/_meta/Dockerfile
#	metricbeat/module/nats/_meta/Dockerfile
#	metricbeat/module/vsphere/_meta/Dockerfile
#	packetbeat/Dockerfile
#	x-pack/functionbeat/Dockerfile
#	x-pack/metricbeat/module/stan/_meta/Dockerfile

* Update changelog.

* Fix conflicts.

* Remove extra changelog entry.

* Fix version in go.mod

* Resolve missed conflicts.

---------

Co-authored-by: apmmachine <58790750+apmmachine@users.noreply.github.com>
Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>
  • Loading branch information
3 people committed Aug 4, 2023
1 parent 65cd7f0 commit 362a2dd
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.19.10
1.19.12
8 changes: 4 additions & 4 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ linters-settings:

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

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

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

stylecheck:
# Select the Go version to target. The default is '1.13'.
go: "1.19.10"
go: "1.19.12"
# 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.19.10"
go: "1.19.12"

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 @@ -9,6 +9,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
==== Breaking changes

*Affecting all Beats*
- Upgrade Go to 1.19.12 {pull}36246[36246]

*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.19.10
FROM golang:1.19.12

RUN \
apt-get update \
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.19.10
FROM golang:1.19.12

RUN \
apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion libbeat/docs/version.asciidoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:stack-version: 8.9.0
:doc-branch: main
:go-version: 1.19.10
:go-version: 1.19.12
: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.19.10
FROM golang:1.19.12

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.16.5
FROM golang:1.19.12

COPY test/main.go main.go

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.19.10
FROM golang:1.19.12

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.19.10
FROM golang:1.19.12

RUN \
apt-get update \
Expand Down

0 comments on commit 362a2dd

Please sign in to comment.