Skip to content

Commit

Permalink
Merge pull request #2191 from daspecster/fix-update-json-docs-script
Browse files Browse the repository at this point in the history
Clean up doc site scripts.
  • Loading branch information
daspecster authored Aug 25, 2016
2 parents 41fcf9f + 94d4ff9 commit e5a1de9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion scripts/update_docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,6 @@ git config --global user.name "travis-ci"
git commit -m "Update docs after merge to master."
# NOTE: This may fail if two docs updates (on merges to master)
# happen in close proximity.
git push \
git push -q \
"https://${GH_OAUTH_TOKEN}@github.com/${GH_OWNER}/${GH_PROJECT_NAME}" \
HEAD:gh-pages
6 changes: 3 additions & 3 deletions scripts/update_json_docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function buildDocs () {
function pushDocs () {
echo "Deploying JSON documentation..."
if [[ ! -d "ghpages" ]]; then
git submodule add -f -b gh-pages https://${GH_OAUTH_TOKEN}@github.com/${GH_OWNER}/${GH_PROJECT_NAME} ghpages
git submodule add -q -f -b gh-pages https://${GH_OAUTH_TOKEN}@github.com/${GH_OWNER}/${GH_PROJECT_NAME} ghpages
fi
mkdir -p ghpages/json/${1}
cp -R docs/_build/json_build/* ghpages/
Expand All @@ -24,7 +24,7 @@ function pushDocs () {
git config user.email "travis@travis-ci.org"
git commit -m "Updating docs for ${1}"
git status
git push https://${GH_OAUTH_TOKEN}@github.com/${GH_OWNER}/${GH_PROJECT_NAME} HEAD:gh-pages
git push -q https://${GH_OAUTH_TOKEN}@github.com/${GH_OWNER}/${GH_PROJECT_NAME} HEAD:gh-pages
else
echo "Nothing to commit."
fi
Expand All @@ -35,7 +35,7 @@ function pushDocs () {

function cleanSubmodule () {
echo "Cleaning up!"
git submodule deinit -f ghpages
git submodule deinit -q -f ghpages
git reset HEAD .gitmodules
git reset HEAD ghpages
rm -rf ghpages
Expand Down

0 comments on commit e5a1de9

Please sign in to comment.