Skip to content

update go-md2man binary to v2.0.7 #12070

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
AkihiroSuda merged 1 commit into from
Jul 9, 2025
Merged

update go-md2man binary to v2.0.7 #12070

AkihiroSuda merged 1 commit into from
Jul 9, 2025

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jul 8, 2025

We updated the vendored dependency, but the binary was still left on an older version.

full diff: cpuguy83/go-md2man@v2.0.2...v2.0.7

@thaJeztah
update go-md2man binary to v2.0.7
62bbdce 
We updated the vendored dependency, but the binary was still left
on an older version.

full diff: cpuguy83/go-md2man@v2.0.2...v2.0.7

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added the cherry-pick/2.1.x Change to be cherry picked to release/2.1 branch label Jul 8, 2025
@github-project-automation github-project-automation bot moved this to Needs Triage in Pull Request Review Jul 8, 2025
@dosubot dosubot bot added dependencies Pull requests that update a dependency file github_actions Pull requests that update GitHub Actions code labels Jul 8, 2025
@github-project-automation github-project-automation bot moved this from Needs Triage to Review In Progress in Pull Request Review Jul 8, 2025
@AkihiroSuda AkihiroSuda added this pull request to the merge queue Jul 8, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jul 8, 2025
@AkihiroSuda AkihiroSuda added this pull request to the merge queue Jul 9, 2025
Merged via the queue into containerd:main with commit 20f5a15 Jul 9, 2025
53 checks passed
@github-project-automation github-project-automation bot moved this from Review In Progress to Done in Pull Request Review Jul 9, 2025
@thaJeztah thaJeztah deleted the bump_go_md2man branch July 9, 2025 07:51
@thaJeztah
Copy link
Member Author

thaJeztah commented Jul 9, 2025

/cherry-pick release/2.1

@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Jul 9, 2025

@thaJeztah: #12070 failed to apply on top of branch "release/2.1":

Applying: update go-md2man binary to v2.0.7
Using index info to reconstruct a base tree...
M	.github/workflows/ci.yml
M	script/setup/install-dev-tools
Falling back to patching base and 3-way merge...
Auto-merging script/setup/install-dev-tools
CONFLICT (content): Merge conflict in script/setup/install-dev-tools
Auto-merging .github/workflows/ci.yml
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 go-md2man binary to v2.0.7
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.

@estesp estesp mentioned this pull request Jul 9, 2025
Merged
@estesp estesp 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 Jul 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@djdongjin djdongjin djdongjin approved these changes

Assignees

No one assigned

Labels

cherry-picked/2.1.x PR commits are cherry picked into the release/2.1 branch dependencies Pull requests that update a dependency file github_actions Pull requests that update GitHub Actions code size/XS

Projects

Pull Request Review
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@thaJeztah @k8s-infra-cherrypick-robot @AkihiroSuda @djdongjin @estesp @k8s-ci-robot