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

update golang to 1.21.1 #2652

Merged
merged 1 commit into from
Sep 6, 2023
Merged

update golang to 1.21.1 #2652

merged 1 commit into from
Sep 6, 2023

Conversation

jacob-delgado
Copy link
Contributor

No description provided.

@jacob-delgado jacob-delgado added cherrypick/release-1.18 Set this label on a PR to auto-merge it to the release-1.18 branch cherrypick/release-1.19 Set this label on a PR to auto-merge it to the release-1.19 branch labels Sep 6, 2023
@jacob-delgado jacob-delgado requested a review from a team as a code owner September 6, 2023 16:34
@istio-testing istio-testing added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 6, 2023
@jacob-delgado
Copy link
Contributor Author

/cherry-pick release-1.18

@istio-testing
Copy link
Contributor

@jacob-delgado: once the present PR merges, I will cherry-pick it on top of release-1.18 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.18

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/test-infra repository.

@jacob-delgado
Copy link
Contributor Author

/cherry-pick release-1.19

@istio-testing
Copy link
Contributor

@jacob-delgado: once the present PR merges, I will cherry-pick it on top of release-1.19 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.19

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/test-infra repository.

@ericvn
Copy link
Contributor

ericvn commented Sep 6, 2023

It looks like you are cherry-picking to 1.18 but you also have a PR for updating it's 1.20 version.

@ericvn
Copy link
Contributor

ericvn commented Sep 6, 2023

It looks like you are cherry-picking to 1.18 but you also have a PR for updating it's 1.20 version.

#2650

@ericvn ericvn removed the cherrypick/release-1.18 Set this label on a PR to auto-merge it to the release-1.18 branch label Sep 6, 2023
@jacob-delgado
Copy link
Contributor Author

/retest

@istio-testing istio-testing merged commit 415d835 into master Sep 6, 2023
4 checks passed
@istio-testing istio-testing deleted the jacob-delgado-patch-5 branch September 6, 2023 19:56
@istio-testing
Copy link
Contributor

@jacob-delgado: #2652 failed to apply on top of branch "release-1.18":

Applying: update golang to 1.21.1
Using index info to reconstruct a base tree...
M	docker/build-tools/Dockerfile
Falling back to patching base and 3-way merge...
Auto-merging docker/build-tools/Dockerfile
CONFLICT (content): Merge conflict in docker/build-tools/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 update golang to 1.21.1
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 release-1.18

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/test-infra repository.

@istio-testing
Copy link
Contributor

@jacob-delgado: new issue could not be created for failed cherrypick: status code 410 not one of [201], body: {"message":"Issues are disabled for this repo","documentation_url":"https://docs.github.com/v3/issues/"}

In response to this:

/cherry-pick release-1.18

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/test-infra repository.

@istio-testing
Copy link
Contributor

In response to a cherrypick label: new pull request created: #2653

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherrypick/release-1.19 Set this label on a PR to auto-merge it to the release-1.19 branch size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants