Skip to content

Commit

Permalink
Rely on npm 6.6.0
Browse files Browse the repository at this point in the history
Do not upgrade npm on Windows.
  • Loading branch information
novemberborn committed Jan 18, 2019
1 parent 6b10f2e commit f0a07cd
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 18 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Expand Up @@ -24,12 +24,12 @@ matrix:
- node_js: 6
os: windows # npm install --global currently fails on Windows. Skip the tests entirely instead.
cache: npm
before_install: if [[ $(node -pe "process.versions.node.split('.')[0]") == "6" ]]; then npm install --global npm@6; fi
before_install: if [[ "$(npm -v)" != "6.6.0" ]] && [[ "${TRAVIS_OS_NAME}" != "windows" ]]; then npm install --global npm@6.6.0; fi
install: npm ci
before_script: |
if [[ ${FRESH_DEPS} == "true" ]]; then
npm install --no-shrinkwrap --prefer-online
else
elif [[ "${TRAVIS_OS_NAME}" != "windows" ]]; then
checksum=$(md5sum package-lock.json)
npm install --package-lock-only
if ! echo ${checksum} | md5sum --quiet -c -; then
Expand All @@ -38,7 +38,7 @@ before_script: |
fi
fi
if [[ "${TRAVIS_OS_NAME}" == 'windows' ]]; then
if [[ "${TRAVIS_OS_NAME}" == "windows" ]]; then
git config core.symlinks true
git reset --hard
fi
Expand Down
56 changes: 41 additions & 15 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit f0a07cd

Please sign in to comment.