Skip to content

ci: bump golang [1.23.9, 1.24.3] in build and release#11834

Merged
dmcgowan merged 1 commit intocontainerd:mainfrom
austinvazquez:bump-golang-versions-05062025-in-ci
May 23, 2025
Merged

ci: bump golang [1.23.9, 1.24.3] in build and release#11834
dmcgowan merged 1 commit intocontainerd:mainfrom
austinvazquez:bump-golang-versions-05062025-in-ci

Conversation

@austinvazquez
Copy link
Copy Markdown
Member

@austinvazquez austinvazquez commented May 10, 2025

No description provided.

@github-project-automation github-project-automation Bot moved this to Needs Triage in Pull Request Review May 10, 2025
@austinvazquez austinvazquez added cherry-pick/2.0.x Change to be cherry picked to release/2.0 branch cherry-pick/2.1.x Change to be cherry picked to release/2.1 branch labels May 10, 2025
@dosubot dosubot Bot added area/toolchain Build and Release Toolchain github_actions Pull requests that update GitHub Actions code go Pull requests that update Go code labels May 10, 2025
@austinvazquez austinvazquez requested a review from akhilerm May 10, 2025 04:42
akhilerm
akhilerm requested changes May 11, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@akhilerm akhilerm left a comment

Choose a reason for hiding this comment

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

A few more files need to be udpated with the go verison changes.

1.23.9 changes : https://github.com/search?q=repo%3Acontainerd%2Fcontainerd%201.23.8&type=code

1.24.3 changes: https://github.com/search?q=repo%3Acontainerd%2Fcontainerd+1.24.2&type=code

@github-project-automation github-project-automation Bot moved this from Needs Triage to Needs Update in Pull Request Review May 11, 2025
@austinvazquez austinvazquez force-pushed the bump-golang-versions-05062025-in-ci branch from e5700de to fea77e1 Compare May 12, 2025 02:57
@austinvazquez austinvazquez added cherry-pick/1.6.x cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels May 12, 2025
@github-project-automation github-project-automation Bot moved this from Needs Update to Review In Progress in Pull Request Review May 12, 2025
@AkihiroSuda AkihiroSuda added this pull request to the merge queue May 12, 2025
github-merge-queue Bot pushed a commit that referenced this pull request May 12, 2025
@AkihiroSuda
Merge pull request #11834 from austinvazquez/bump-golang-versions-050…
a4d85d6 
…62025-in-ci

ci: bump golang [1.23.9, 1.24.3] in build and release
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks May 12, 2025
@estesp estesp added this pull request to the merge queue May 12, 2025
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks May 12, 2025
@dmcgowan dmcgowan added this pull request to the merge queue May 20, 2025
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks May 20, 2025
@akhilerm
Copy link
Copy Markdown
Member

akhilerm commented May 23, 2025

@dmcgowan can we try the merge now? will have to cherry-pick these changes to release branches before make a new patch release

@dmcgowan dmcgowan added this pull request to the merge queue May 23, 2025
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks May 23, 2025
@dmcgowan dmcgowan added this pull request to the merge queue May 23, 2025
Merged via the queue into containerd:main with commit f6ae79a May 23, 2025
58 checks passed
@github-project-automation github-project-automation Bot moved this from Review In Progress to Done in Pull Request Review May 23, 2025
@akhilerm
Copy link
Copy Markdown
Member

akhilerm commented May 24, 2025

/cherry-pick release/2.1
/cherry-pick release/2.0

@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

k8s-infra-cherrypick-robot commented May 24, 2025

@akhilerm: #11834 failed to apply on top of branch "release/2.0":

Applying: ci: bump golang [1.23.9, 1.24.3] in build and release
Using index info to reconstruct a base tree...
M	.devcontainer/devcontainer.json
M	.github/workflows/api-release.yml
M	.github/workflows/ci.yml
M	.github/workflows/release.yml
M	Vagrantfile
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 Vagrantfile
CONFLICT (content): Merge conflict in Vagrantfile
Auto-merging .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
Auto-merging .devcontainer/devcontainer.json
CONFLICT (content): Merge conflict in .devcontainer/devcontainer.json
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 ci: bump golang [1.23.9, 1.24.3] in build and release
Details

In response to this:

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

@akhilerm
Copy link
Copy Markdown
Member

akhilerm commented May 24, 2025

/cherry-pick release/2.1

@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

k8s-infra-cherrypick-robot commented May 24, 2025

@akhilerm: new pull request created: #11889

Details

In response to this:

/cherry-pick release/2.1

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 May 24, 2025
Merged
@austinvazquez austinvazquez added cherry-picked/2.1.x PR commits are cherry picked into the release/2.1 branch and removed cherry-pick/2.1.x Change to be cherry picked to release/2.1 branch labels May 24, 2025
@austinvazquez austinvazquez deleted the bump-golang-versions-05062025-in-ci branch July 21, 2025 23:26
@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 cherry-picked/2.0.x PR commits are cherry picked into the release/2.0 branch and removed 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 Jul 21, 2025
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

@estesp estesp estesp approved these changes

@akhilerm akhilerm akhilerm approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

Assignees

No one assigned

Labels

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 cherry-picked/2.1.x PR commits are cherry picked into the release/2.1 branch github_actions Pull requests that update GitHub Actions code go Pull requests that update Go code size/S

Projects

Pull Request Review
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

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