Skip to content

Commit

Permalink
Merge pull request #2920 from vector-im/dbkr/ci_build_js_sdk
Browse files Browse the repository at this point in the history
Build the js-sdk in the CI script
  • Loading branch information
dbkr authored Jan 12, 2017
2 parents 717aa94 + 0d05e60 commit 6b02bf8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ node_js:
- 6 # node v6, to match jenkins
install:
- npm install
- (cd node_modules/matrix-js-sdk && npm install)
- (cd node_modules/matrix-react-sdk && npm run build)
3 changes: 2 additions & 1 deletion scripts/jenkins.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ tar -C olm -xz < olm/olm-*.tgz
rm -r node_modules/olm
cp -r olm/package node_modules/olm

# we may be using a dev branch of react-sdk, in which case we need to build it
# 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-react-sdk && npm run build)

# run the mocha tests
Expand Down

0 comments on commit 6b02bf8

Please sign in to comment.