imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Weblate 2018-10-26 09:13:35 +00:00
commit 44ae73f1f5
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.travis-test-riot.sh
View file

@ -27,6 +27,8 @@ npm run build
npm run test npm run test
popd popd
if [ "$TRAVIS_BRANCH" != "experimental" ]
then
# run end to end tests # run end to end tests
git clone https://github.com/matrix-org/matrix-react-end-to-end-tests.git --branch master git clone https://github.com/matrix-org/matrix-react-end-to-end-tests.git --branch master
pushd matrix-react-end-to-end-tests pushd matrix-react-end-to-end-tests
@ -36,3 +38,4 @@ ln -s $REACT_SDK_DIR/$RIOT_WEB_DIR riot/riot-web
./install.sh ./install.sh
./run.sh --travis ./run.sh --travis
popd popd
fi