OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Use the right js-sdk branch when testing 

On the react-sdk tests not just riot-web
pull/21833/head
David Baker 2018-05-02 10:58:43 +01:00
parent 1413890a9a
commit 730512bc3f
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis-test-riot.sh
View File

@ -9,16 +9,9 @@ set -ev
RIOT_WEB_DIR=riot-web RIOT_WEB_DIR=riot-web
REACT_SDK_DIR=`pwd` REACT_SDK_DIR=`pwd`
curbranch="${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}" scripts/fetchdep.sh vector-im riot-web
echo "Determined branch to be $curbranch"
git clone https://github.com/vector-im/riot-web.git \
"$RIOT_WEB_DIR"
cd "$RIOT_WEB_DIR" cd "$RIOT_WEB_DIR"
git checkout "$curbranch" || git checkout develop
mkdir node_modules mkdir node_modules
npm install npm install

4
scripts/travis.sh
View File

@ -2,6 +2,10 @@
set -ex set -ex
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
npm run test npm run test
./.travis-test-riot.sh ./.travis-test-riot.sh