Skip to content

Commit

Permalink
add Node.js v10 to build; fix win32 issues (#3350)
Browse files Browse the repository at this point in the history
* fix npm version to 5.x
* AppVeyor: add Node.js v10; use npm ci for speed
* revert package-lock.json to what npm@5 uses
* add .gitattributes
* remove linebreak-style from eslintrc
* avoid all symlink tests on win32

Signed-off-by: Christopher Hiller <boneskull@boneskull.com>
  • Loading branch information
boneskull committed May 18, 2018
1 parent b392af5 commit d87b12e
Show file tree
Hide file tree
Showing 6 changed files with 4,506 additions and 4,733 deletions.
3 changes: 0 additions & 3 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ rules:
strict:
- error
- safe
linebreak-style:
- error
- unix
overrides:
- files:
- scripts/**/*.js
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text=auto
10 changes: 8 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ stages:

# defaults
language: node_js
node_js: '9'
node_js: '10'
# `nvm install` happens before the cache is restored, which means
# we must install our own npm elsewhere (`~/npm`)
before_install: |
[[ ! -x ~/npm/node_modules/.bin/npm ]] && {
# caching feature creates `~/npm` for us
cd ~/npm && npm install npm
cd ~/npm && npm install npm@^5
cd -
} || true
# avoids bugs around https://github.com/travis-ci/travis-ci/issues/5092
Expand All @@ -34,6 +34,9 @@ jobs:
script: npm start test.node
node_js: '8'

- <<: *node
node_js: '9'

- <<: *node
node_js: '6'

Expand Down Expand Up @@ -66,6 +69,9 @@ jobs:
- ~/.npm
- node_modules # npm install, unlike npm ci, doesn't wipe node_modules

- <<: *smoke
node_js: '9'

- <<: *smoke
node_js: '8'

Expand Down
5 changes: 3 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ platform:
- x64
environment:
matrix:
- nodejs_version: '10'
- nodejs_version: '9'
- nodejs_version: '8'
- nodejs_version: '6'
Expand All @@ -10,8 +11,8 @@ install:
- ps: Install-Product node $env:nodejs_version x64
- set CI=true
- set PATH=%APPDATA%\npm;c:\MinGW\bin;%PATH%
- npm install -g npm
- npm install
- npm install -g npm@^5
- npm ci --ignore-scripts
matrix:
fast_finish: true
build: off
Expand Down
Loading

0 comments on commit d87b12e

Please sign in to comment.