Merge pull request #46993 from david-mcmahon/gen-docs

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

Merge pull request #46993 from david-mcmahon/gen-docs
98c868d0 · Kubernetes Submit Queue · GitHub · d86c2671 · 4d70ec95 · 98c868d0
Commit 98c868d0 authored Jun 21, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

cherry_pick_pull.sh hack/cherry_pick_pull.sh +9 -0

No files found.
--- a/hack/cherry_pick_pull.sh
+++ b/hack/cherry_pick_pull.sh
@@ -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:"