Skip to content

Commit

Permalink
Merge pull request #245 from silvolu/update-docs-on-merge
Browse files Browse the repository at this point in the history
build: update docs after merge to master
  • Loading branch information
silvolu committed Oct 15, 2014
2 parents fba037f + c21a95e commit a2d8944
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 0 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ after_success:
- tox -e cover
- tox -e lint
- coveralls
- scripts/merge.sh
31 changes: 31 additions & 0 deletions scripts/merge.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#!/bin/bash

# Copyright 2014 Google Inc. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

set -ev

# if merging to master and not a pull request, update docs
if [ "${TRAVIS_BRANCH}" == "master" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
# generate new set of json files in docs/json/master
tox -e docs
git submodule add -b gh-pages https://${GH_OAUTH_TOKEN}@github.com/${GH_OWNER}/${GH_PROJECT_NAME} ghpages
cp -R docs/_build/html/* ghpages/
cd ghpages
git add .
# commit to gh-pages branch to apply changes
git config user.name "selfiebot"
git commit -m "Update docs after merge to master"
git push https://${GH_OAUTH_TOKEN}@github.com/${GH_OWNER}/${GH_PROJECT_NAME} HEAD:gh-pages
fi

0 comments on commit a2d8944

Please sign in to comment.