Skip to content

Commit

Permalink
Merge pull request #46993 from david-mcmahon/gen-docs
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue

Regenerate docs (if necessary) during cherry-pick operations.

This change ensures that cherrypicks are coupled with any related doc generation required.
closes #44533
  • Loading branch information
Kubernetes Submit Queue committed Jun 22, 2017
2 parents d86c267 + 4d70ec9 commit 98c868d
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions hack/cherry_pick_pull.sh
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,15 @@ for pull in "${PULLS[@]}"; do
done
gitamcleanup=false

# Re-generate docs (if needed)
echo
echo "Regenerating docs..."
if ! hack/generate-docs.sh; then
echo
echo "hack/generate-docs.sh FAILED to complete."
exit 1
fi

if [[ -n "${DRY_RUN}" ]]; then
echo "!!! Skipping git push and PR creation because you set DRY_RUN."
echo "To return to the branch you were in when you invoked this script:"
Expand Down

0 comments on commit 98c868d

Please sign in to comment.