From 46207538ef12943ec12ebf190b10ab9c1ef9f4b3 Mon Sep 17 00:00:00 2001
From: Peter Bacon Darwin <pete@bacondarwin.com>
Date: Sat, 22 Jul 2017 06:59:50 +0100
Subject: [PATCH] ci: short-circuit npm install for aio builds that use yarn
 only

---
 scripts/ci/install.sh | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/scripts/ci/install.sh b/scripts/ci/install.sh
index ac41010076..f335e28be9 100755
--- a/scripts/ci/install.sh
+++ b/scripts/ci/install.sh
@@ -28,17 +28,18 @@ mkdir -p ${LOGS_DIR}
 # Install node
 #nvm install ${NODE_VERSION}
 
-
-# Install version of npm that we are locked against
-travisFoldStart "install-npm"
-  npm install -g npm@${NPM_VERSION}
-travisFoldEnd "install-npm"
+if [[ ${CI_MODE} != "aio" && ${CI_MODE} != 'docs_test' ]]; then
+  # Install version of npm that we are locked against
+  travisFoldStart "install-npm"
+    npm install -g npm@${NPM_VERSION}
+  travisFoldEnd "install-npm"
 
 
-# Install all npm dependencies according to shrinkwrap.json
-travisFoldStart "npm-install"
-  node tools/npm/check-node-modules --purge || npm install
-travisFoldEnd "npm-install"
+  # Install all npm dependencies according to shrinkwrap.json
+  travisFoldStart "npm-install"
+    node tools/npm/check-node-modules --purge || npm install
+  travisFoldEnd "npm-install"
+fi
 
 
 if [[ ${TRAVIS} && (${CI_MODE} == "e2e" || ${CI_MODE} == "e2e_2" || ${CI_MODE} == "aio" || ${CI_MODE} == "aio_e2e" || ${CI_MODE} == "docs_test") ]]; then