Skip to content

(PDOC-121) Include tag or SHA in gh_pages task commit #121

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.

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

Merged
merged 1 commit into from
Nov 3, 2016

Conversation

whopper
Copy link
Contributor

@whopper whopper commented Nov 3, 2016

This commit updates the gh_pages task to reference the SHA
of the branch being documented in the documentation commit.

In addition, the description of each task except update
has been removed, as they are not useful on their own and
should be considered private. This is necessary in order
to hide the tasks from the output of rake -T.

@@ -37,13 +44,14 @@
task :push do
Dir.chdir('doc') do
system 'git add .'
system "git commit -m '[strings] Generated Documentation Update'"
system "git commit -m '[strings] Generated Documentation Update at Revision #{@git_sha}'"
Copy link
Contributor

Choose a reason for hiding this comment

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

Should the :push task just depend on the :get_sha task in case someone runs it directly?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ah, I hadn't thought of that. Good idea :D

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@scotje updated

@whopper whopper force-pushed the PDOC-121/master/gh_pages_sha branch from ce56ed2 to 8b58c26 Compare November 3, 2016 20:12
system 'git push origin gh-pages -f'
end
end

desc 'Run checkout, generate, and push tasks.'
task :update => [
:get_sha,
Copy link
Contributor

Choose a reason for hiding this comment

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

don't know that it hurts anything but this is probably unnecessary now

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Indeed, updated.

@whopper whopper force-pushed the PDOC-121/master/gh_pages_sha branch 2 times, most recently from ad8be3c to 66f750c Compare November 3, 2016 20:34
@whopper
Copy link
Contributor Author

whopper commented Nov 3, 2016

@scotje updated again

@whopper whopper force-pushed the PDOC-121/master/gh_pages_sha branch from 66f750c to 3a6222c Compare November 3, 2016 20:36
system 'git push origin gh-pages -f'
end
end

desc 'Run checkout, generate, and push tasks.'
desc 'Run checkout, generate, configure, and push tasks.'
Copy link
Contributor

Choose a reason for hiding this comment

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

One last thing, we should probably make this description just say "update docs and push to github" or something like that, since we aren't advertising the underlying tasks anymore.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

This commit updates the gh_pages task to reference the SHA
of the branch being documented in the documentation commit.

In addition, the description of each task except `update`
has been removed, as they are not useful on their own and
should be considered private. This is necessary in order
to hide the tasks from the output of `rake -T`.
@whopper whopper force-pushed the PDOC-121/master/gh_pages_sha branch from 3a6222c to 05806e7 Compare November 3, 2016 20:41
@scotje scotje merged commit 2e64a37 into puppetlabs:master Nov 3, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants