From 206ad3159c6f1b41ebf1770dcb394d7cea77da30 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Thu, 25 Oct 2018 17:47:38 +0200 Subject: [PATCH] disable e2e tests for PRs targeted at experimental (redesign) --- .travis-test-riot.sh | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/.travis-test-riot.sh b/.travis-test-riot.sh index 7f2660a906..6cd073a1f8 100755 --- a/.travis-test-riot.sh +++ b/.travis-test-riot.sh @@ -27,12 +27,15 @@ npm run build npm run test popd -# run end to end tests -git clone https://github.com/matrix-org/matrix-react-end-to-end-tests.git --branch 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 +if [ "$TRAVIS_BRANCH" != "experimental" ] +then + # run end to end tests + git clone https://github.com/matrix-org/matrix-react-end-to-end-tests.git --branch 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