mirror of https://github.com/vector-im/riot-web
Merge pull request #2092 from vector-im/rav/use_development_olm
jenkins.sh: install olm from jenkins artifactspull/2134/head
commit
c0eb69963d
|
@ -13,6 +13,9 @@ npm install
|
||||||
# apparently npm 3.10.3 on node 6.4.0 doesn't upgrade #develop target with npm install unless explicitly asked.
|
# apparently npm 3.10.3 on node 6.4.0 doesn't upgrade #develop target with npm install unless explicitly asked.
|
||||||
npm install matrix-react-sdk matrix-js-sdk
|
npm install matrix-react-sdk matrix-js-sdk
|
||||||
|
|
||||||
|
# install olm
|
||||||
|
npm install ./olm/olm-*.tgz
|
||||||
|
|
||||||
# we may be using a dev branch of react-sdk, in which case we need to build it
|
# we may be using a dev branch of react-sdk, in which case we need to build it
|
||||||
(cd node_modules/matrix-react-sdk && npm run build)
|
(cd node_modules/matrix-react-sdk && npm run build)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue