Merge pull request #3105 from vector-im/rav/fix_jenkins_build

Fix jenkins build
This commit is contained in:
David Baker 2017-02-01 16:28:47 +00:00 committed by GitHub
commit 0db97b8f5b
2 changed files with 3 additions and 3 deletions

View file

@ -4,4 +4,4 @@ node_js:
install: install:
- npm install - npm install
- (cd node_modules/matrix-js-sdk && npm install) - (cd node_modules/matrix-js-sdk && npm install)
- (cd node_modules/matrix-react-sdk && npm run build) - (cd node_modules/matrix-react-sdk && npm install)

View file

@ -20,8 +20,8 @@ rm -r node_modules/olm
cp -r olm/package node_modules/olm cp -r olm/package node_modules/olm
# we may be using dev branches of js-sdk and react-sdk, in which case we need to build them # we may be using dev branches of js-sdk and react-sdk, in which case we need to build them
(cd node_modules/matrix-js-sdk && npm run build) (cd node_modules/matrix-js-sdk && npm install)
(cd node_modules/matrix-react-sdk && npm run build) (cd node_modules/matrix-react-sdk && npm install)
# run the mocha tests # run the mocha tests
npm run test npm run test