diff --git a/jenkins.sh b/jenkins.sh index 3a4ee0c7..2bccf0f8 100755 --- a/jenkins.sh +++ b/jenkins.sh @@ -13,6 +13,12 @@ npm install # 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 +# install olm. A naive 'npm i ./olm/olm-*.tgz' fails because it uses the url +# from our package.json (or even matrix-js-sdk's) in preference. +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 (cd node_modules/matrix-react-sdk && npm run build) diff --git a/package.json b/package.json index cc87daf5..c52e26d0 100644 --- a/package.json +++ b/package.json @@ -90,6 +90,6 @@ "webpack": "^1.12.14" }, "optionalDependencies": { - "olm": "https://matrix.org/packages/npm/olm/olm-1.1.0.tgz" + "olm": "https://matrix.org/packages/npm/olm/olm-1.2.0.tgz" } }