Skip to content

update to go1.23.4 / go1.22.10 #11102

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.

Sign up for GitHub

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

Jump to bottom
Merged
dmcgowan merged 1 commit into from
Dec 6, 2024
Merged

update to go1.23.4 / go1.22.10 #11102

dmcgowan merged 1 commit into from
Dec 6, 2024

Conversation

@akhilerm
Copy link
Member

@akhilerm akhilerm commented Dec 5, 2024

@akhilerm
update to go1.23.4 / go1.22.10
81780a5 
- go1.23.4 (released 2024-12-03) includes fixes to the compiler, the runtime,
the trace command, and the syscall package. See the Go 1.23.4 milestone on
our issue tracker for details.
https://github.com/golang/go/issues?q=milestone%3AGo1.23.4+label%3ACherryPickApproved

- go1.22.10 (released 2024-12-03) includes fixes to the runtime and the
syscall package. See the Go 1.22.10 milestone on our issue tracker for details.
https://github.com/golang/go/issues?q=milestone%3AGo1.22.10+label%3ACherryPickApproved

Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
@dosubot dosubot bot added area/toolchain Build and Release Toolchain area/github_actions Pull requests that update GitHub Actions code labels Dec 5, 2024
@austinvazquez austinvazquez added cherry-pick/1.6.x cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch cherry-pick/2.0.x Change to be cherry picked to release/2.0 branch labels Dec 5, 2024
@dmcgowan dmcgowan added this pull request to the merge queue Dec 5, 2024
Merged via the queue into containerd:main with commit 3e20045 Dec 6, 2024
58 checks passed
@austinvazquez
Copy link
Member

austinvazquez commented Dec 6, 2024

/cherry-pick release/2.0

@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Dec 6, 2024

@austinvazquez: new pull request created: #11109

Details

In response to this:

/cherry-pick release/2.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.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Dec 6, 2024
Merged
@akhilerm
Copy link
Member Author

akhilerm commented Dec 6, 2024

/cherry-pick release/1.7

@akhilerm akhilerm deleted the update-go-1.23.4 branch December 6, 2024 03:30
@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Dec 6, 2024

@akhilerm: #11102 failed to apply on top of branch "release/1.7":

Applying: update to go1.23.4 / go1.22.10
Using index info to reconstruct a base tree...
A	.devcontainer/devcontainer.json
M	.github/actions/install-go/action.yml
M	.github/workflows/api-release.yml
M	.github/workflows/ci.yml
M	.github/workflows/release.yml
M	Vagrantfile
M	contrib/Dockerfile.test
M	contrib/fuzz/oss_fuzz_build.sh
M	script/setup/prepare_env_windows.ps1
Falling back to patching base and 3-way merge...
Auto-merging script/setup/prepare_env_windows.ps1
CONFLICT (content): Merge conflict in script/setup/prepare_env_windows.ps1
Auto-merging contrib/fuzz/oss_fuzz_build.sh
CONFLICT (content): Merge conflict in contrib/fuzz/oss_fuzz_build.sh
Auto-merging contrib/Dockerfile.test
CONFLICT (content): Merge conflict in contrib/Dockerfile.test
Auto-merging Vagrantfile
CONFLICT (content): Merge conflict in Vagrantfile
Auto-merging .github/workflows/release.yml
CONFLICT (content): Merge conflict in .github/workflows/release.yml
Auto-merging .github/workflows/ci.yml
CONFLICT (content): Merge conflict in .github/workflows/ci.yml
Auto-merging .github/workflows/api-release.yml
CONFLICT (content): Merge conflict in .github/workflows/api-release.yml
Auto-merging .github/actions/install-go/action.yml
CONFLICT (content): Merge conflict in .github/actions/install-go/action.yml
CONFLICT (modify/delete): .devcontainer/devcontainer.json deleted in HEAD and modified in update to go1.23.4 / go1.22.10. Version update to go1.23.4 / go1.22.10 of .devcontainer/devcontainer.json left in tree.
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 update to go1.23.4 / go1.22.10
Details

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-sigs/prow repository.

@dmcgowan dmcgowan added cherry-picked/2.0.x PR commits are cherry picked into the release/2.0 branch and removed cherry-pick/2.0.x Change to be cherry picked to release/2.0 branch labels Dec 9, 2024
@austinvazquez austinvazquez added cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch and removed cherry-pick/1.6.x cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels Dec 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dmcgowan dmcgowan dmcgowan approved these changes

@austinvazquez austinvazquez austinvazquez approved these changes

Assignees

No one assigned

Labels

area/github_actions Pull requests that update GitHub Actions code area/toolchain Build and Release Toolchain cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch cherry-picked/2.0.x PR commits are cherry picked into the release/2.0 branch size/S

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@akhilerm @austinvazquez @k8s-infra-cherrypick-robot @dmcgowan @k8s-ci-robot