Skip to content

[release-1.12] Update golang builder to 1.20.12 #1536

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

Merged
merged 1 commit into from
Dec 14, 2023

Conversation

msau42
Copy link
Contributor

@msau42 msau42 commented Dec 14, 2023

What type of PR is this?
/kind cleanup

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

Update golang builder to 1.20.12

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Dec 14, 2023
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 14, 2023
@msau42
Copy link
Contributor Author

msau42 commented Dec 14, 2023

/cherry-pick release-1.11

@k8s-infra-cherrypick-robot

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

In response to this:

/cherry-pick release-1.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/test-infra repository.

@msau42
Copy link
Contributor Author

msau42 commented Dec 14, 2023

/cherry-pick 1.10
/cherry-pick 1.9
/cherry-pick 1.8
/cherry-pick 1.7

@k8s-infra-cherrypick-robot

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

In response to this:

/cherry-pick 1.10
/cherry-pick 1.9
/cherry-pick 1.8
/cherry-pick 1.7

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.

Copy link
Contributor

@leiyiz leiyiz left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 14, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: leiyiz, msau42

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

@msau42
Copy link
Contributor Author

msau42 commented Dec 14, 2023

/cherry-pick release-1.9

@k8s-infra-cherrypick-robot

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

In response to this:

/cherry-pick release-1.9

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.

@msau42
Copy link
Contributor Author

msau42 commented Dec 14, 2023

/cherry-pick release-1.8

@k8s-infra-cherrypick-robot

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

In response to this:

/cherry-pick release-1.8

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.

@msau42
Copy link
Contributor Author

msau42 commented Dec 14, 2023

/cherry-pick release-1.7

@k8s-infra-cherrypick-robot

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

In response to this:

/cherry-pick release-1.7

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.

@k8s-ci-robot k8s-ci-robot merged commit ecdcd71 into kubernetes-sigs:release-1.12 Dec 14, 2023
@k8s-infra-cherrypick-robot

@msau42: cannot checkout 1.9: error checking out "1.9": exit status 1 error: pathspec '1.9' did not match any file(s) known to git

In response to this:

/cherry-pick 1.10
/cherry-pick 1.9
/cherry-pick 1.8
/cherry-pick 1.7

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.

@k8s-infra-cherrypick-robot

@msau42: #1536 failed to apply on top of branch "1.8":

Applying: Update golang builder to 1.20.12
Using index info to reconstruct a base tree...
M	Dockerfile
M	Dockerfile.Windows
M	Dockerfile.debug
Falling back to patching base and 3-way merge...
Auto-merging Dockerfile.debug
CONFLICT (content): Merge conflict in Dockerfile.debug
Auto-merging Dockerfile.Windows
CONFLICT (content): Merge conflict in Dockerfile.Windows
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 Update golang builder to 1.20.12
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 1.10
/cherry-pick 1.9
/cherry-pick 1.8
/cherry-pick 1.7

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.

@k8s-infra-cherrypick-robot

@msau42: cannot checkout 1.7: error checking out "1.7": exit status 1 error: pathspec '1.7' did not match any file(s) known to git

In response to this:

/cherry-pick 1.10
/cherry-pick 1.9
/cherry-pick 1.8
/cherry-pick 1.7

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.

@k8s-infra-cherrypick-robot

@msau42: new pull request created: #1537

In response to this:

/cherry-pick release-1.9

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.

@k8s-infra-cherrypick-robot

@msau42: new pull request created: #1538

In response to this:

/cherry-pick release-1.8

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.

@k8s-infra-cherrypick-robot

@msau42: new pull request created: #1539

In response to this:

/cherry-pick release-1.7

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.

@k8s-infra-cherrypick-robot

@msau42: new pull request created: #1540

In response to this:

/cherry-pick release-1.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/test-infra repository.

@msau42
Copy link
Contributor Author

msau42 commented Dec 14, 2023

/cherry-pick release-1.10

@k8s-infra-cherrypick-robot

@msau42: cannot checkout 1.10: error checking out "1.10": exit status 1 error: pathspec '1.10' did not match any file(s) known to git

In response to this:

/cherry-pick 1.10
/cherry-pick 1.9
/cherry-pick 1.8
/cherry-pick 1.7

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.

@k8s-infra-cherrypick-robot

@msau42: new pull request created: #1541

In response to this:

/cherry-pick release-1.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/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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.

4 participants