Merge branch 'develop' into wmwragg/one-to-one-chat

wmwragg · wmwragg · commit a3b77475c789 · 2016-09-07T17:23:43.000+01:00
diff --git 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
@@ -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"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,6 @@`
`90`	`90`	`"webpack": "^1.12.14"`
`91`	`91`	`},`
`92`	`92`	`"optionalDependencies": {`
`93`		`- "olm": "https://matrix.org/packages/npm/olm/olm-1.1.0.tgz"`
	`93`	`+ "olm": "https://matrix.org/packages/npm/olm/olm-1.2.0.tgz"`
`94`	`94`	`}`
`95`	`95`	`}`