From d309a7a67b246a440f86764032487d4c94c71011 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Mon, 5 Sep 2016 18:54:10 +0100
Subject: [PATCH 1/3] jenkins.sh: install olm from jenkins artifacts

Use the latest version of olm, as provided by jenkins, rather than the most
recent release.
---
 jenkins.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jenkins.sh b/jenkins.sh
index 3a4ee0c7..258e3586 100755
--- a/jenkins.sh
+++ b/jenkins.sh
@@ -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.
 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
 (cd node_modules/matrix-react-sdk && npm run build)
 

From 835d13c696b4a13756c783c55d258a9d3f100e3e Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 6 Sep 2016 13:24:06 +0100
Subject: [PATCH 2/3] Another go at using latest Olm

The previous attempt failed due to npm shenanigans. Let's have another go,
without the "help" of npm.
---
 jenkins.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/jenkins.sh b/jenkins.sh
index 258e3586..2bccf0f8 100755
--- a/jenkins.sh
+++ b/jenkins.sh
@@ -13,8 +13,11 @@ 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
-npm install ./olm/olm-*.tgz
+# 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)

From 31dd49ffd77eb68172fec2ff8a16c0e10dd89d5c Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 6 Sep 2016 22:33:21 +0100
Subject: [PATCH 3/3] Bump to olm 1.2.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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"
   }
 }