sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

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

Browse Source 
Fix jenkins build
This commit is contained in:
David Baker
2017-02-01 16:28:47 +00:00
committed by GitHub
parent 6369d76a74 3404521d5d
commit 0db97b8f5b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1 -1
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)
scripts/jenkins.sh
+2 -2
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