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

Bump go to 1.21 #143

Merged
merged 1 commit into from
Aug 27, 2024
Merged

Bump go to 1.21 #143

merged 1 commit into from
Aug 27, 2024

Conversation

harishsurf
Copy link
Contributor

No description provided.

Signed-off-by: harishsurf <[email protected]>
@harishsurf
Copy link
Contributor Author

/cherry-pick redhat-3.11

@openshift-cherrypick-robot

@harishsurf: once the present PR merges, I will cherry-pick it on top of redhat-3.11 in a new PR and assign it to you.

In response to this:

/cherry-pick redhat-3.11

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.

@harishsurf
Copy link
Contributor Author

/cherry-pick redhat-3.12

@openshift-cherrypick-robot

@harishsurf: once the present PR merges, I will cherry-pick it on top of redhat-3.12 in a new PR and assign it to you.

In response to this:

/cherry-pick redhat-3.12

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.

Copy link
Contributor

@jonathankingfc jonathankingfc left a comment

Choose a reason for hiding this comment

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

LGTM

@harishsurf harishsurf merged commit a1ed154 into quay:master Aug 27, 2024
3 checks passed
@harishsurf harishsurf deleted the bump-go-cso branch August 27, 2024 16:07
@openshift-cherrypick-robot

@harishsurf: #143 failed to apply on top of branch "redhat-3.11":

Applying: Bump go to 1.21
Using index info to reconstruct a base tree...
M	Dockerfile
M	go.mod
Falling back to patching base and 3-way merge...
Auto-merging go.mod
Auto-merging Dockerfile
CONFLICT (content): Merge conflict in Dockerfile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bump go to 1.21
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick redhat-3.11

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

@harishsurf: #143 failed to apply on top of branch "redhat-3.12":

Applying: Bump go to 1.21
Using index info to reconstruct a base tree...
M	Dockerfile
M	go.mod
Falling back to patching base and 3-way merge...
Auto-merging go.mod
Auto-merging Dockerfile
CONFLICT (content): Merge conflict in Dockerfile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bump go to 1.21
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick redhat-3.12

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
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants