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 #36000) upgrade Go to 1.20.6 #36869

Merged
merged 6 commits into from
Oct 24, 2023
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 16, 2023

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

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

You are currently cherry-picking commit a278734f11.
  (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:   CHANGELOG.next.asciidoc
	modified:   dev-tools/mage/gotest_test.go
	modified:   filebeat/input/syslog/format_check.go
	modified:   filebeat/input/syslog/rfc3164_parser.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .go-version
	both modified:   .golangci.yml
	both modified:   Vagrantfile
	both modified:   auditbeat/Dockerfile
	deleted by us:   dev-tools/kubernetes/filebeat/Dockerfile.debug
	deleted by us:   dev-tools/kubernetes/heartbeat/Dockerfile.debug
	deleted by us:   dev-tools/kubernetes/metricbeat/Dockerfile.debug
	both modified:   dev-tools/mage/gotest.go
	both modified:   filebeat/input/syslog/rfc5424_parser.go
	both modified:   heartbeat/Dockerfile
	both modified:   libbeat/docs/version.asciidoc
	deleted by us:   libbeat/reader/syslog/rfc3164_test.go
	deleted by us:   libbeat/reader/syslog/rfc5424_test.go
	both modified:   metricbeat/Dockerfile
	both modified:   metricbeat/module/http/_meta/Dockerfile
	both modified:   metricbeat/module/nats/_meta/Dockerfile
	both modified:   packetbeat/Dockerfile
	both modified:   x-pack/functionbeat/Dockerfile
	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

* upgrade Go to 1.20.5

* ignore known issue with go tool cover

* capture cover output and check it for errors

* debug

* wip

* move ragel files to root directory

the //line directives used to point to the original "ragel" files were creating problems for the coverage tool. They were being reported without the 'parser/' directory. Causing the go tool cover to look for the wrong files and therefore failing.
Moving it all to the root directory fixes the problem.

* upgrade to go1.20.6

* .

* Revert "move ragel files to root directory"

This reverts commit 2b6a159.

* remove debug

* disable //line directives

* goimport

(cherry picked from commit a278734)

# Conflicts:
#	.go-version
#	.golangci.yml
#	Vagrantfile
#	auditbeat/Dockerfile
#	dev-tools/kubernetes/filebeat/Dockerfile.debug
#	dev-tools/kubernetes/heartbeat/Dockerfile.debug
#	dev-tools/kubernetes/metricbeat/Dockerfile.debug
#	dev-tools/mage/gotest.go
#	filebeat/input/syslog/rfc5424_parser.go
#	heartbeat/Dockerfile
#	libbeat/docs/version.asciidoc
#	libbeat/reader/syslog/rfc3164_test.go
#	libbeat/reader/syslog/rfc5424_test.go
#	metricbeat/Dockerfile
#	metricbeat/module/http/_meta/Dockerfile
#	metricbeat/module/nats/_meta/Dockerfile
#	packetbeat/Dockerfile
#	x-pack/functionbeat/Dockerfile
#	x-pack/metricbeat/module/stan/_meta/Dockerfile
@mergify mergify bot requested review from a team as code owners October 16, 2023 21:11
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 16, 2023
@mergify mergify bot requested review from a team as code owners October 16, 2023 21:11
@mergify mergify bot requested review from rdner and fearful-symmetry and removed request for a team October 16, 2023 21:11
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 16, 2023
@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 16, 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-10-23T19:54:44.400+0000

  • Duration: 175 min 11 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!)

CHANGELOG.next.asciidoc Outdated Show resolved Hide resolved
@pierrehilbert pierrehilbert added the Team:Elastic-Agent Label for the Agent team label Oct 17, 2023
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Oct 17, 2023
@mergify
Copy link
Contributor Author

mergify bot commented Oct 23, 2023

This pull request has not been merged yet. Could you please review and merge it @AndersonQ? 🙏

@cmacknz cmacknz merged commit 124d238 into 7.17 Oct 24, 2023
133 of 136 checks passed
@cmacknz cmacknz deleted the mergify/bp/7.17/pr-36000 branch October 24, 2023 00:39
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.

4 participants