Skip to content

Commit

Permalink
Fix pages deployment and Travis timeout
Browse files Browse the repository at this point in the history
  • Loading branch information
lpatino10 committed Sep 7, 2017
1 parent e5ee59b commit 12f002d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -40,7 +40,7 @@ script:
- ./gradlew generateReleaseJavadoc
- echo no | android create avd --force -n test -t $API --abi $ABI
- emulator -avd test -no-skin -no-audio -no-window &
- android-wait-for-emulator
- travis_wait android-wait-for-emulator
- adb shell input keyevent 82 &

after_success:
Expand Down
2 changes: 1 addition & 1 deletion .utility/push-javadoc-to-gh-pages.sh
Expand Up @@ -4,7 +4,7 @@ if [ "$TRAVIS_REPO_SLUG" == "watson-developer-cloud/android-sdk" ] && [ "$TRAVIS

git config --global user.email "wps@us.ibm.com"
git config --global user.name "Watson Github Bot"
git clone --quiet --branch=gh-pages https://${GITHUB_TOKEN}@github.com/watson-developer-cloud/android-sdk gh-pages > /dev/null
git clone --quiet --branch=gh-pages https://${GITHUB_TOKEN}@github.com/watson-developer-cloud/android-sdk.git gh-pages > /dev/null

pushd gh-pages
# on tagged builds, $TRAVIS_BRANCH is the tag (e.g. v1.2.3), otherwise it's the branch name (e.g. master)
Expand Down

0 comments on commit 12f002d

Please sign in to comment.