// Cherry-pick a merged pull request onto a release branch with Prow-style branch naming, manual conflict resolution, targeted validation, and GitHub PR creation. Use when the user wants to backport a PR, cherry-pick a commit to a release branch, or mentions cherry-pick, backport, or porting a fix to an older release.
Diagnose and unblock failed Dependabot pull requests in cloud-provider-azure by classifying CI failures, syncing Go modules, retesting quota-flaked e2e jobs, and updating PR status. Use when a Dependabot PR fails go-mod-consistency, pull-cloud-provider-azure-e2e jobs, or dependency/toolchain CI.
Synchronize all tracked Go modules with the go-mod-consistency CI and refresh the root vendor tree. Use when go-mod-consistency fails, dependency bumps leave go.mod or go.sum stale, or the user asks to unblock module consistency, tidy all modules, or update vendor for the main module.
Generate or update the documentation-site release note for a given tag, commit it on a branch, push it to a writable remote, and open a GitHub PR to the docs branch. Use when the user wants to create or update release notes, generate a changelog for a tag, or mentions release notes, docs PR, or documentation for a release.
Prepare and publish a stable release in two phases by reusing the shared release-tag and release-note-doc-pr skills, building artifacts in GitHub, generating release notes and draft releases locally, validating release assets, and controlling latest-release status explicitly. Use when the user wants to perform a full release, publish a new version, or mentions releasing, shipping a version, or the end-to-end release process.
Scan a built container image with Trivy, classify fixable Go-module and base-image CVEs, apply dependency and Dockerfile fixes, and verify the result with file checks and an optional image rescan. Use when the user wants to fix CVEs in a container image, scan for vulnerabilities, or mentions Trivy, CVE remediation, image security, or dependency vulnerabilities.
Create and optionally push the next Kubernetes-style release tag (vX.Y.Z) from a release-X.Y branch by resolving the remote branch tip, computing the next patch tag, and tagging the commit directly without checking out the branch. Use when the user wants to tag a release, create a version tag, or mentions release tagging, cutting a release, or bumping a patch version.
| name | cherry-pick-pr |
| description | Cherry-pick a merged pull request onto a release branch with Prow-style branch naming, manual conflict resolution, targeted validation, and GitHub PR creation. Use when the user wants to backport a PR, cherry-pick a commit to a release branch, or mentions cherry-pick, backport, or porting a fix to an older release. |
Use this skill when you need to cherry-pick a merged PR onto a release branch and want the agent to handle the git and GitHub workflow while keeping conflict resolution and test decisions in the loop.
Replace <SKILL_DIR> with the path to this skill directory.
python3 <SKILL_DIR>/scripts/cherry_pick_pr.py pick \
--pr <number> \
--target-branch <release-X.Y> \
--dry-run
python3 <SKILL_DIR>/scripts/cherry_pick_pr.py pick \
--pr <number> \
--target-branch <release-X.Y>
pick exits with code 3, inspect the conflicted files from the output,
read the source diff with gh pr diff <number>, resolve the conflicts, stage
the files with git add, then continue:python3 <SKILL_DIR>/scripts/cherry_pick_pr.py continue
python3 <SKILL_DIR>/scripts/cherry_pick_pr.py test
test reports success:python3 <SKILL_DIR>/scripts/cherry_pick_pr.py create-pr
python3 <SKILL_DIR>/scripts/cherry_pick_pr.py abort
pick from a dirty working tree..git/cherry-pick-pr.json
exists. Run abort first..git/ intentionally so it stays untracked.continue runs git cherry-pick --continue non-interactively.test records passed, failed, or build_failed so the agent can tell
the difference between test failures and target-branch compatibility issues.create-pr reads .github/PULL_REQUEST_TEMPLATE.md at runtime and fails if
required anchors drift.create-pr expects the source PR to already carry a kind/... label. If it
does not, fix that first or update the source PR metadata before creating the
cherry-pick PR.--chain <branch>... on pick when you want the resulting PR body to
append a follow-up /cherrypick ... command for later serialized backports.