diff --git a/.travis.yml b/.travis.yml index 2c414e7c59..bfc4d265a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,7 @@ matrix: # run the linter, but exclude any files known to have errors or warnings. - npm run lintwithexclusions - name: End-to-End Tests + if: branch = develop install: - sudo apt-get install build-essential python2.7-dev libffi-dev python-pip python-setuptools sqlite3 libssl-dev python-virtualenv libjpeg-dev libxslt1-dev script: diff --git a/scripts/travis/end-to-end-tests.sh b/scripts/travis/end-to-end-tests.sh index 285458bd4b..361b053d2b 100755 --- a/scripts/travis/end-to-end-tests.sh +++ b/scripts/travis/end-to-end-tests.sh @@ -9,16 +9,13 @@ set -ev RIOT_WEB_DIR=riot-web REACT_SDK_DIR=`pwd` -if [ "$TRAVIS_BRANCH" = "develop" ] -then - scripts/travis/build.sh - # run end to end tests - scripts/fetchdep.sh matrix-org matrix-react-end-to-end-tests master - pushd matrix-react-end-to-end-tests - ln -s $REACT_SDK_DIR/$RIOT_WEB_DIR riot/riot-web - # PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh - # CHROME_PATH=$(which google-chrome-stable) ./run.sh - ./install.sh - ./run.sh --travis - popd -fi +scripts/travis/build.sh +# run end to end tests +scripts/fetchdep.sh matrix-org matrix-react-end-to-end-tests master +pushd matrix-react-end-to-end-tests +ln -s $REACT_SDK_DIR/$RIOT_WEB_DIR riot/riot-web +# PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh +# CHROME_PATH=$(which google-chrome-stable) ./run.sh +./install.sh +./run.sh --travis +popd diff --git a/scripts/travis/install-deps.sh b/scripts/travis/install-deps.sh index 5acc801af8..04cd728157 100755 --- a/scripts/travis/install-deps.sh +++ b/scripts/travis/install-deps.sh @@ -1,7 +1,7 @@ #!/bin/sh set -ex - +npm install scripts/fetchdep.sh matrix-org matrix-js-sdk rm -r node_modules/matrix-js-sdk || true ln -s ../matrix-js-sdk node_modules/matrix-js-sdk