Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.17](backport #37123) [Automation] Bump Golang version to 1.20.11 #37125

Merged
merged 6 commits into from
Nov 15, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 15, 2023

This is an automatic backport of pull request #37123 done by Mergify.
Cherry-pick of f04686c has failed:

On branch mergify/bp/7.17/pr-37123
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit f04686c188.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .golangci.yml
	modified:   CHANGELOG.next.asciidoc
	modified:   auditbeat/Dockerfile
	modified:   dev-tools/kubernetes/filebeat/Dockerfile.debug
	modified:   dev-tools/kubernetes/heartbeat/Dockerfile.debug
	modified:   dev-tools/kubernetes/metricbeat/Dockerfile.debug
	modified:   heartbeat/Dockerfile
	modified:   metricbeat/Dockerfile
	modified:   metricbeat/module/http/_meta/Dockerfile
	modified:   metricbeat/module/nats/_meta/Dockerfile
	modified:   metricbeat/module/vsphere/_meta/Dockerfile
	modified:   packetbeat/Dockerfile
	modified:   x-pack/functionbeat/Dockerfile

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .go-version
	both modified:   libbeat/docs/version.asciidoc
	both modified:   x-pack/metricbeat/module/stan/_meta/Dockerfile

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* chore: Update Auditbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update Heartbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update Heartbeat debug Dockerfile

Made with ❤️️ by updatecli

* chore: Update .go-version

Made with ❤️️ by updatecli

* chore: Update .golangci.yml

Made with ❤️️ by updatecli

* chore: Update Packetbeat 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 from vsphere Dockerfile

Made with ❤️️ by updatecli

* chore: Update Functionbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update version.asciidoc

Made with ❤️️ by updatecli

* chore: Update Metricbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update stan Dockerfile

Made with ❤️️ by updatecli

* chore: Update Filebeat debug Dockerfile

Made with ❤️️ by updatecli

* chore: Update HTTP module Dockerfile

Made with ❤️️ by updatecli

* Add changelog.

---------

Co-authored-by: apmmachine <[email protected]>
Co-authored-by: Craig MacKenzie <[email protected]>
(cherry picked from commit f04686c)

# Conflicts:
#	.go-version
#	libbeat/docs/version.asciidoc
#	x-pack/metricbeat/module/stan/_meta/Dockerfile
@mergify mergify bot requested a review from a team as a code owner November 15, 2023 03:25
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 15, 2023
@mergify mergify bot requested review from a team as code owners November 15, 2023 03:25
@mergify mergify bot requested review from ycombinator and belimawr and removed request for a team November 15, 2023 03:25
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 15, 2023
@elasticmachine
Copy link
Collaborator

elasticmachine commented Nov 15, 2023

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2023-11-15T19:30:41.866+0000

  • Duration: 170 min 48 sec

Test stats 🧪

Test Results
Failed 0
Passed 22161
Skipped 1402
Total 23563

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@pierrehilbert pierrehilbert requested a review from a team as a code owner November 15, 2023 07:01
@pierrehilbert pierrehilbert requested review from gizas and constanca-m and removed request for a team November 15, 2023 07:01
@pierrehilbert pierrehilbert added the Team:Elastic-Agent Label for the Agent team label Nov 15, 2023
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Nov 15, 2023
@@ -151,7 +151,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet
containers:
- name: metricbeat
image: docker.elastic.co/beats/metricbeat:7.17.15
image: docker.elastic.co/beats/metricbeat:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should the image version remain empty? does not seem right?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gizas this was because of the files generation.
Do you know why the make command is generated them without a version?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This happened in the 8.11 backport too, but didn't happen on main.

This reverts commit c94eb9e.
@pierrehilbert
Copy link
Collaborator

/test

CHANGELOG.next.asciidoc Outdated Show resolved Hide resolved
@cmacknz cmacknz enabled auto-merge (squash) November 15, 2023 19:53
@cmacknz cmacknz merged commit 1569567 into 7.17 Nov 15, 2023
130 checks passed
@cmacknz cmacknz deleted the mergify/bp/7.17/pr-37123 branch November 15, 2023 22:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request Team:Elastic-Agent Label for the Agent team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants