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 #37550) Update to Go 1.21.5 #37561

Merged
merged 5 commits into from
Jan 8, 2024
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 5, 2024

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

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

You are currently cherry-picking commit d1b32774ae.
  (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:   .github/workflows/golangci-lint.yml
	modified:   .go-version
	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:   go.mod
	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
	modified:   x-pack/metricbeat/module/stan/_meta/Dockerfile

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .golangci.yml
	both modified:   go.sum
	both modified:   libbeat/docs/version.asciidoc

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 to Go 1.21.5.

* Update to latest linter.

* Update changelog

* Update golangci.yml.

(cherry picked from commit d1b3277)

# Conflicts:
#	.golangci.yml
#	go.sum
#	libbeat/docs/version.asciidoc
@mergify mergify bot requested a review from a team as a code owner January 5, 2024 19:18
@mergify mergify bot added the backport label Jan 5, 2024
@mergify mergify bot requested a review from a team as a code owner January 5, 2024 19:18
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jan 5, 2024
@mergify mergify bot requested review from a team as code owners January 5, 2024 19:18
@mergify mergify bot requested review from rdner and fearful-symmetry and removed request for a team January 5, 2024 19:18
@mergify mergify bot assigned cmacknz Jan 5, 2024
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jan 5, 2024
@elasticmachine
Copy link
Collaborator

💔 Build Failed

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

  • Duration: 6 min 22 sec

Pipeline error 1

This error is likely related to the pipeline itself. Click here
and then you will see the error (either incorrect syntax or an invalid configuration).

❕ Flaky test report

No test was executed to be analysed.

🤖 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!)

@cmacknz cmacknz added the Team:Elastic-Agent Label for the Agent team label Jan 5, 2024
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jan 5, 2024
@elasticmachine
Copy link
Collaborator

💔 Build Failed

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

  • Duration: 6 min 5 sec

Pipeline error 1

This error is likely related to the pipeline itself. Click here
and then you will see the error (either incorrect syntax or an invalid configuration).

❕ Flaky test report

No test was executed to be analysed.

🤖 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!)

@elasticmachine
Copy link
Collaborator

💚 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: 2024-01-05T19:34:56.523+0000

  • Duration: 161 min 6 sec

Test stats 🧪

Test Results
Failed 0
Passed 22157
Skipped 1404
Total 23561

💚 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!)

@elasticmachine
Copy link
Collaborator

💚 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: 2024-01-05T22:16:34.826+0000

  • Duration: 158 min 23 sec

Test stats 🧪

Test Results
Failed 0
Passed 22157
Skipped 1404
Total 23561

💚 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!)

Copy link
Contributor Author

mergify bot commented Jan 8, 2024

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

.golangci.yml Outdated Show resolved Hide resolved
@elasticmachine
Copy link
Collaborator

💚 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

  • Duration: 156 min 35 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 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!)

@cmacknz cmacknz merged commit 7653f97 into 7.17 Jan 8, 2024
134 checks passed
@cmacknz cmacknz deleted the mergify/bp/7.17/pr-37550 branch January 8, 2024 18:01
cmacknz added a commit to cmacknz/beats that referenced this pull request Jan 10, 2024
cmacknz added a commit that referenced this pull request Jan 10, 2024
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.

2 participants