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

[release-2.12] Bump golang.org/x/crypto from 0.28.0 to 0.31.0 #1727

Conversation

openshift-cherrypick-robot
Copy link
Collaborator

This is an automated cherry-pick of #1723

/assign jacobbaungard

/cherrypick release-2.11 release-2.10

Copy link

openshift-ci bot commented Dec 17, 2024

Thanks for your pull request. Before we can look at it, you'll need to add a 'DCO signoff' to your commits.

📝 Please follow instructions in the contributing guide to update your commits with the DCO

Full details of the Developer Certificate of Origin can be found at developercertificate.org.

The list of commits missing DCO signoff:

  • f0a0ebc Bump golang.org/x/crypto from 0.28.0 to 0.31.0

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@jacobbaungard
Copy link
Contributor

/lgtm
/cherry-pick release-2.11
/cherry-pick release-2.10

@openshift-cherrypick-robot
Copy link
Collaborator Author

@jacobbaungard: once the present PR merges, I will cherry-pick it on top of release-2.10, release-2.11 in new PRs and assign them to you.

In response to this:

/lgtm
/cherry-pick release-2.11
/cherry-pick release-2.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-ci openshift-ci bot added the lgtm label Dec 17, 2024
Copy link

openshift-ci bot commented Dec 17, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jacobbaungard, openshift-cherrypick-robot

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@jacobbaungard
Copy link
Contributor

/override dco
(dependabot)

Copy link

openshift-ci bot commented Dec 17, 2024

@jacobbaungard: Overrode contexts on behalf of jacobbaungard: dco

In response to this:

/override dco
(dependabot)

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@jacobbaungard
Copy link
Contributor

/test test-e2e

1 similar comment
@jacobbaungard
Copy link
Contributor

/test test-e2e

@openshift-merge-bot openshift-merge-bot bot merged commit 1c2abc9 into stolostron:release-2.12 Dec 18, 2024
18 checks passed
@openshift-cherrypick-robot
Copy link
Collaborator Author

@openshift-cherrypick-robot: #1727 failed to apply on top of branch "release-2.11":

Applying: Bump golang.org/x/crypto from 0.28.0 to 0.31.0
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Bump golang.org/x/crypto from 0.28.0 to 0.31.0

In response to this:

This is an automated cherry-pick of #1723

/assign jacobbaungard

/cherrypick release-2.11 release-2.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot
Copy link
Collaborator Author

@jacobbaungard: #1727 failed to apply on top of branch "release-2.10":

Applying: Bump golang.org/x/crypto from 0.28.0 to 0.31.0
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Bump golang.org/x/crypto from 0.28.0 to 0.31.0

In response to this:

/lgtm
/cherry-pick release-2.11
/cherry-pick release-2.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants