From a4aa74e85ae2d029fee211042af39d5cd8df1e62 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 11 Jan 2017 17:18:37 +0000 Subject: [PATCH 1/8] Build the js-sdk in the CI script now it's transpiled --- jenkins.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jenkins.sh b/jenkins.sh index b318b586e2..1e281fa016 100755 --- a/jenkins.sh +++ b/jenkins.sh @@ -12,6 +12,9 @@ set -x # install the other dependencies npm install +# we may be using a dev branch of js-sdk in which case we need to build it +(cd node_modules/matrix-js-sdk && npm run build) + # run the mocha tests npm run test From 5142cb63c85b7e2bef41276adf40d48fc00d4423 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 11 Jan 2017 18:18:46 +0000 Subject: [PATCH 2/8] s/build/compile/ for js sdk --- jenkins.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins.sh b/jenkins.sh index 1e281fa016..788f5f03d8 100755 --- a/jenkins.sh +++ b/jenkins.sh @@ -13,7 +13,7 @@ set -x npm install # we may be using a dev branch of js-sdk in which case we need to build it -(cd node_modules/matrix-js-sdk && npm run build) +(cd node_modules/matrix-js-sdk && npm run compile) # run the mocha tests npm run test From fcc40ee37275b8a76a7d3c5ed7a92324a689a0a8 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 11 Jan 2017 19:03:20 +0000 Subject: [PATCH 3/8] It's now just build --- jenkins.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins.sh b/jenkins.sh index 788f5f03d8..1e281fa016 100755 --- a/jenkins.sh +++ b/jenkins.sh @@ -13,7 +13,7 @@ set -x npm install # we may be using a dev branch of js-sdk in which case we need to build it -(cd node_modules/matrix-js-sdk && npm run compile) +(cd node_modules/matrix-js-sdk && npm run build) # run the mocha tests npm run test From 2708859b34b588ef335b60bdce439f830fdc0808 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 12 Jan 2017 16:38:48 +0000 Subject: [PATCH 5/8] npm install the js-sdk otherwise we don't have uglifyjs --- jenkins.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins.sh b/jenkins.sh index 1e281fa016..3b4e31fd7f 100755 --- a/jenkins.sh +++ b/jenkins.sh @@ -13,7 +13,7 @@ set -x npm install # we may be using a dev branch of js-sdk in which case we need to build it -(cd node_modules/matrix-js-sdk && npm run build) +(cd node_modules/matrix-js-sdk && npm install) # run the mocha tests npm run test From 4ca4441f77b331f06f6098b79a702793c5d2a7e1 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 12 Jan 2017 17:09:49 +0000 Subject: [PATCH 7/8] Build js-sdk in travis too --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9d6a114391..2221b7295d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,6 @@ language: node_js node_js: - node # Latest stable version of nodejs. +install: + - npm install + - (cd node_modules/matrix-react-sdk && npm install) From 3706d6e32ad4e17861804c2e2b92d80ffc9991ef Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 12 Jan 2017 17:14:51 +0000 Subject: [PATCH 8/8] js-sdk, not react-sdk --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2221b7295d..6d68b66a1c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,4 +3,4 @@ node_js: - node # Latest stable version of nodejs. install: - npm install - - (cd node_modules/matrix-react-sdk && npm install) + - (cd node_modules/matrix-js-sdk && npm install)