From dc00c83c3466a8f3641630e2b0c930405fe68ca1 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Mon, 24 Aug 2020 10:18:38 -0700
Subject: [PATCH] Correctly fail CI on JS failures

---
 ci/script.sh | 50 ++++++++++++++++++++++----------------------------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/ci/script.sh b/ci/script.sh
index f8312dd4..1e97e984 100755
--- a/ci/script.sh
+++ b/ci/script.sh
@@ -66,41 +66,35 @@ done
 
 # Test token js bindings
 js_token() {
-  (
-    set -x
-    cd token/js
-    time npm install
-    time npm run lint
-    time npm run flow
-    tsc module.d.ts
+  cd token/js
+  time npm install || exit $?
+  time npm run lint || exit $?
+  time npm run flow || exit $?
+  tsc module.d.ts || exit $?
 
-    npm run cluster:localnet
-    npm run localnet:down
-    npm run localnet:update
-    npm run localnet:up
-    time npm run start
-    npm run localnet:down
-  )
+  npm run cluster:localnet || exit $?
+  npm run localnet:down
+  npm run localnet:update || exit $?
+  npm run localnet:up || exit $?
+  time npm run start || exit $?
+  npm run localnet:down
 }
 _ js_token
 
 # Test token-swap js bindings
 js_token_swap() {
-  (
-    set -x
-    cd token-swap/js
-    time npm install
-    time npm run lint
-    time npm run flow
+  cd token-swap/js
+  time npm install || exit $?
+  time npm run lint || exit $?
+  time npm run flow || exit $?
 
-    # TODO: Uncomment once https://github.com/solana-labs/solana/issues/11465 is resolved
-    # npm run cluster:localnet
-    # npm run localnet:down
-    # npm run localnet:update
-    # npm run localnet:up
-    # npm run start
-    # npm run localnet:down
-  )
+  # TODO: Uncomment once https://github.com/solana-labs/solana/issues/11465 is resolved
+  # npm run cluster:localnet || exit $?
+  # npm run localnet:down
+  # npm run localnet:update || exit $?
+  # npm run localnet:up || exit $?
+  # npm run start || exit $?
+  # npm run localnet:down
 }
 _ js_token_swap