ci: short-circuit npm install for aio builds that use yarn only

This commit is contained in:
Peter Bacon Darwin 2017-07-22 06:59:50 +01:00 committed by Alex Rickabaugh
parent 71eb7437b6
commit 46207538ef
1 changed files with 10 additions and 9 deletions

View File

@ -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