Merge pull request #992 from matrix-org/rav/no_run_riot_tests_on_test_fail

travisci: Don't run the riot-web tests if the react-sdk tests fail
2017-06-01 18:39:33 +01:00 · 2017-06-01 18:39:33 +01:00 · f756d231cf
commit f756d231cf
parent 33214b8752 6e693612a0
1 changed files with 3 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -5,5 +5,6 @@ install:
    - npm install
    - (cd node_modules/matrix-js-sdk && npm install)
 script:
-    - npm run test
-    - ./.travis-test-riot.sh
+    # don't run the riot tests unless the react-sdk tests pass, otherwise
+    # the output is confusing.
+    - npm run test && ./.travis-test-riot.sh