committed by
Igor Minar
parent
213baa37b0
commit
f48b343af1
+1
-2
@@ -35,9 +35,8 @@ fi
|
||||
#######################
|
||||
|
||||
setEnvVar NODE_VERSION 6.9.5
|
||||
setEnvVar NPM_VERSION 3.10.7 # do not upgrade to >3.10.8 unless https://github.com/npm/npm/issues/14042 is resolved
|
||||
setEnvVar YARN_VERSION 1.0.2
|
||||
setEnvVar SAUCE_CONNECT_VERSION 4.3.11
|
||||
setEnvVar SAUCE_CONNECT_VERSION 4.4.9
|
||||
setEnvVar ANGULAR_CLI_VERSION 1.4.0-rc.2
|
||||
setEnvVar PROJECT_ROOT $(cd ${thisDir}/../..; pwd)
|
||||
|
||||
|
||||
+9
-24
@@ -28,24 +28,17 @@ 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"
|
||||
|
||||
# Install version of yarn that we are locked against
|
||||
travisFoldStart "install-yarn"
|
||||
curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version "${YARN_VERSION}"
|
||||
travisFoldEnd "install-yarn"
|
||||
|
||||
|
||||
# Install all npm dependencies according to shrinkwrap.json
|
||||
travisFoldStart "npm-install"
|
||||
node tools/npm/check-node-modules --purge || npm install
|
||||
travisFoldEnd "npm-install"
|
||||
|
||||
|
||||
# Install Selenium WebDriver
|
||||
travisFoldStart "webdriver-manager-update"
|
||||
# --gecko false prevents webdriver-manager to ping Github for updates
|
||||
# which can hit the Github api limit.
|
||||
$(npm bin)/webdriver-manager update --gecko false
|
||||
travisFoldEnd "webdriver-manager-update"
|
||||
# Install all npm dependencies according to yarn.lock
|
||||
travisFoldStart "yarn-install"
|
||||
node tools/npm/check-node-modules --purge || yarn install
|
||||
travisFoldEnd "yarn-install"
|
||||
|
||||
|
||||
# Install bower packages
|
||||
@@ -54,14 +47,6 @@ travisFoldStart "bower-install"
|
||||
travisFoldEnd "bower-install"
|
||||
|
||||
|
||||
if [[ ${TRAVIS} && (${CI_MODE} == "e2e" || ${CI_MODE} == "e2e_2" || ${CI_MODE} == "aio" || ${CI_MODE} == "aio_e2e" || ${CI_MODE} == "aio_tools_test") ]]; then
|
||||
# Install version of yarn that we are locked against
|
||||
travisFoldStart "install-yarn"
|
||||
curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version "${YARN_VERSION}"
|
||||
travisFoldEnd "install-yarn"
|
||||
fi
|
||||
|
||||
|
||||
if [[ ${TRAVIS} && (${CI_MODE} == "aio" || ${CI_MODE} == "aio_e2e" || ${CI_MODE} == "aio_tools_test") ]]; then
|
||||
# angular.io: Install all yarn dependencies according to angular.io/yarn.lock
|
||||
travisFoldStart "yarn-install.aio"
|
||||
|
||||
@@ -22,7 +22,7 @@ CONNECT_URL="https://saucelabs.com/downloads/sc-${SAUCE_CONNECT_VERSION}-linux.t
|
||||
CONNECT_DIR="/tmp/sauce-connect-$RANDOM"
|
||||
CONNECT_DOWNLOAD="sc-latest-linux.tar.gz"
|
||||
|
||||
# logging disabled because it's seems to be overwhelming travis and causing flakes
|
||||
# logging disabled because it seems to be overwhelming travis and causing flakes
|
||||
# when we are cat-ing the log in print-logs.sh
|
||||
# CONNECT_LOG="$LOGS_DIR/sauce-connect"
|
||||
# CONNECT_STDOUT="$LOGS_DIR/sauce-connect.stdout"
|
||||
|
||||
Reference in New Issue
Block a user