Skip to content
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

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

Merged
merged 1 commit into from Jun 22, 2017
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions hack/cherry_pick_pull.sh
View file
Open in desktop
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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this makes the cherry-pick script unnecessarily slow (for most changes which do not require docs updates) and fragile (on failure, it does not enter a retry loop like the conflict case above). I'd rather see this be opt-in.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this also breaks cherry-picks to 1.6 and leaves them with lots of uncommitted generated docs in the working dir

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