Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ jobs:
- stage: "Fundamental-react: Test"
name: "Unit tests"
script: npm run test:coverage
- stage: deploy
if: branch = master AND type != pull_request
before_deploy:
- bash ./ci-scripts/setup_npm.sh
deploy:
- provider: script
script: bash ./ci-scripts/publish.sh $TRAVIS_BRANCH $TRAVIS_BUILD_NUMBER
skip_cleanup: true
notifications:
email:
on_failure: always
on_success: change
before_deploy:
- bash ./ci-scripts/setup_npm.sh
deploy:
- provider: script
script: bash ./ci-scripts/publish.sh $TRAVIS_BRANCH $TRAVIS_BUILD_NUMBER
on:
branch: master
skip_cleanup: true
on_success: change
1 change: 0 additions & 1 deletion ci-scripts/publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ git checkout develop
git merge master
git commit -a -m "chore: merge master into develop [ci skip]"
git push --quiet --follow-tags "https://$GH_TOKEN@github.com/$TRAVIS_REPO_SLUG" develop > /dev/null 2>&1;

# publish master to npm
git checkout master
npm publish