diff --git a/.gitignore b/.gitignore index 05ada888..ef8191bd 100644 --- a/.gitignore +++ b/.gitignore @@ -71,4 +71,7 @@ package-lock.json # ignore yarn lock on example example/*/yarn.lock -example/*/package-lock.json \ No newline at end of file +example/*/package-lock.json + +# OSX +.DS_Store \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 5344c76a..e62c583c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,11 +23,16 @@ jobs: script: - yarn build deploy: - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^canary|master$ - provider: script - skip_cleanup: true - script: - - echo "RELEASING" + - provider: script + on: + branch: canary + skip_cleanup: true + script: + - echo "RELEASING CANARY" + - provider: script + on: + branch: master + skip_cleanup: true + script: + - echo "RELEASING STABLE"