Skip to content
This repository was archived by the owner on May 17, 2024. It is now read-only.

Commit 80a8ffb

Browse files
committed
Remove regenerate docs from cherrypick
Signed-off-by: JoshVanL <[email protected]>
1 parent 35a63d1 commit 80a8ffb

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

hack/cherry-pick-pull.sh

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ cd "${KUBE_ROOT}"
3131
declare -r STARTINGBRANCH=$(git symbolic-ref --short HEAD)
3232
declare -r REBASEMAGIC="${KUBE_ROOT}/.git/rebase-apply"
3333
DRY_RUN=${DRY_RUN:-""}
34-
REGENERATE_DOCS=${REGENERATE_DOCS:-""}
3534
UPSTREAM_REMOTE=${UPSTREAM_REMOTE:-upstream}
3635
FORK_REMOTE=${FORK_REMOTE:-origin}
3736

@@ -57,9 +56,6 @@ if [[ "$#" -lt 2 ]]; then
5756
echo " This is useful for creating patches to a release branch without making a PR."
5857
echo " When DRY_RUN is set the script will leave you in a branch containing the commits you cherry-picked."
5958
echo
60-
echo " Set the REGENERATE_DOCS environment var to regenerate documentation for the target branch after picking the specified commits."
61-
echo " This is useful when picking commits containing changes to API documentation."
62-
echo
6359
echo " Set UPSTREAM_REMOTE (default: upstream) and FORK_REMOTE (default: origin)"
6460
echo " To override the default remote names to what you have locally."
6561
exit 2
@@ -189,17 +185,6 @@ for pull in "${PULLS[@]}"; do
189185
done
190186
gitamcleanup=false
191187

192-
# Re-generate docs (if needed)
193-
if [[ -n "${REGENERATE_DOCS}" ]]; then
194-
echo
195-
echo "Regenerating docs..."
196-
if ! hack/generate-docs.sh; then
197-
echo
198-
echo "hack/generate-docs.sh FAILED to complete."
199-
exit 1
200-
fi
201-
fi
202-
203188
if [[ -n "${DRY_RUN}" ]]; then
204189
echo "!!! Skipping git push and PR creation because you set DRY_RUN."
205190
echo "To return to the branch you were in when you invoked this script:"

0 commit comments

Comments
 (0)