Skip to content

Commit

Permalink
Merge branch 'issue195-fix-docs' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@nnarain
nnarain committed Dec 12, 2018
2 parents e03516f + 96f1c99 commit 87f8fd9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ script:
- cd ..

after_success:
- ./scripts/travis_deploy_docs $TRAVIS_BRANCH $GITHUB_API_TOKEN
- bash ./scripts/travis_deploy_docs $TRAVIS_BRANCH $GITHUB_API_TOKEN
- cd build
- make package
- export ARTIFACTS=$(ls -d1 $PWD/*.tar.gz)
Expand Down
4 changes: 2 additions & 2 deletions scripts/travis_deploy_docs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ export BRANCH=$1
export API_TOKEN=$2

# only deploy on master branch commit
if [[ "$BRANCH" != "develop" ]]; then
exit 0
if [[ "$BRANCH" != "master" ]]; then
exit 0
fi

# clone into what is going to be the docs output directory
Expand Down

0 comments on commit 87f8fd9

Please sign in to comment.