Skip to content
This repository has been archived by the owner on Mar 8, 2020. It is now read-only.

Commit

Permalink
reverting to use shell script as travis.yml not working (#2979)
Browse files Browse the repository at this point in the history
Signed-off-by: Matthew B White <[email protected]>
  • Loading branch information
mbwhite authored and cazfletch committed Dec 7, 2017
1 parent f5b1f54 commit f2bdfa9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 11 deletions.
15 changes: 5 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,11 @@ script: ./.travis/script.sh
after_failure: |
tail -n +1 -- /home/travis/.npm/_logs/*-debug.log
deploy:
- provider: script
script: ./.travis/deploy.sh
skip_cleanup: true
on:
branch: master
- provider: script
script: ./.travis/deploy.sh
skip_cleanup: true
on:
branch: v0.16.x
provider: script
script: ./.travis/deploy.sh
skip_cleanup: true
on:
all_branches: true
cache:
directories:
- node_modules
Expand Down
4 changes: 3 additions & 1 deletion .travis/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,12 @@ if [[ "${TRAVIS_REPO_SLUG}" != hyperledger* ]]; then
exit 0
fi

# Check that if this is not a tagged build (branch control in .travis.yml deploy providers)
# Check that if this is not a tagged build and not master or the stable v0.16.x
if [ "${TRAVIS_TAG}" = "" ]; then
if [ "${TRAVIS_BRANCH}" == "master" -o "${TRAVIS_BRANCH}" == "v0.16.x" ]; then
echo Not executing as not building a tag
exit 0
fi
fi

# are we building the docs?
Expand Down

0 comments on commit f2bdfa9

Please sign in to comment.