Skip to content

Commit f0a07cd

Browse files
committed
Rely on npm 6.6.0
Do not upgrade npm on Windows.
1 parent 6b10f2e commit f0a07cd

File tree

2 files changed

+44
-18
lines changed

2 files changed

+44
-18
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ matrix:
2424
- node_js: 6
2525
os: windows # npm install --global currently fails on Windows. Skip the tests entirely instead.
2626
cache: npm
27-
before_install: if [[ $(node -pe "process.versions.node.split('.')[0]") == "6" ]]; then npm install --global npm@6; fi
27+
before_install: if [[ "$(npm -v)" != "6.6.0" ]] && [[ "${TRAVIS_OS_NAME}" != "windows" ]]; then npm install --global npm@6.6.0; fi
2828
install: npm ci
2929
before_script: |
3030
if [[ ${FRESH_DEPS} == "true" ]]; then
3131
npm install --no-shrinkwrap --prefer-online
32-
else
32+
elif [[ "${TRAVIS_OS_NAME}" != "windows" ]]; then
3333
checksum=$(md5sum package-lock.json)
3434
npm install --package-lock-only
3535
if ! echo ${checksum} | md5sum --quiet -c -; then
@@ -38,7 +38,7 @@ before_script: |
3838
fi
3939
fi
4040
41-
if [[ "${TRAVIS_OS_NAME}" == 'windows' ]]; then
41+
if [[ "${TRAVIS_OS_NAME}" == "windows" ]]; then
4242
git config core.symlinks true
4343
git reset --hard
4444
fi

package-lock.json

Lines changed: 41 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)