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

[8.16](backport #4405) Upgrade x/crypto and x/net to latest #4408

Open
wants to merge 4 commits into
base: 8.16
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 4, 2025

Upgrade x/crypto and x/net to latest to address some dependabot alerts.


This is an automatic backport of pull request #4405 done by Mergify.

* Update golang.org/x/crypto to v0.32.0.

* Update golang.org/x/net to v0.34.0

* Update changelog.

* go mod tidy the testing/ directory

(cherry picked from commit 25ff1eb)

# Conflicts:
#	testing/go.mod
#	testing/go.sum
@mergify mergify bot added the backport label Feb 4, 2025
@mergify mergify bot requested a review from a team as a code owner February 4, 2025 22:47
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Feb 4, 2025
@mergify mergify bot requested review from kaanyalti and pchila February 4, 2025 22:47
@mergify mergify bot assigned cmacknz Feb 4, 2025
Copy link
Contributor Author

mergify bot commented Feb 4, 2025

Cherry-pick of 25ff1eb has failed:

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

You are currently cherry-picking commit 25ff1eb.
  (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:   NOTICE.txt
	new file:   changelog/fragments/1738701949-Upgrade-golang.org-x-net-to-v0.34.0-and-golang.org-x-crypto-to-v0.32.0..yaml
	modified:   go.mod
	modified:   go.sum

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   testing/go.mod
	both modified:   testing/go.sum

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

@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Feb 5, 2025
@pierrehilbert
Copy link
Contributor


malformed go.sum:
--
  | /opt/buildkite-agent/builds/bk-agent-prod-gcp-1738750591936715487/elastic/fleet-server/testing/go.sum:201: wrong number of fields 9


cc @jlind23

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-Control-Plane Label for the Agent Control Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants