File tree 3 files changed +7
-10
lines changed
3 files changed +7
-10
lines changed Original file line number Diff line number Diff line change @@ -56,8 +56,7 @@ before_install:
56
56
- " npm config set shrinkwrap false"
57
57
58
58
# Setup Node.js version-specific dependencies
59
- - " test $TRAVIS_NODE_VERSION != '0.6' || npm rm --save-dev nyc"
60
- - " test $TRAVIS_NODE_VERSION != '0.8' || npm rm --save-dev nyc"
59
+ - " node tool/install-nyc.js --nyc-optional"
61
60
- " test $(echo $TRAVIS_NODE_VERSION | cut -d. -f1) -ge 4 || npm rm --save-dev eslint"
62
61
63
62
# Update Node.js modules
@@ -78,10 +77,9 @@ before_script:
78
77
- " docker exec mysql mysql -e 'select version()'"
79
78
80
79
script :
81
- # Run test script, depending on nyc install
82
- - " test ! -z $(npm -ps ls nyc) || npm test"
83
- - " test -z $(npm -ps ls nyc) || npm run-script test-ci"
84
- - " test -z $(npm -ps ls eslint) || npm run-script lint"
80
+ # Run test script
81
+ - " npm run-script test-ci"
82
+ - " test -z $(npm -ps ls eslint) || npm run-script lint"
85
83
86
84
after_script :
87
85
- " test -d .nyc_output && npm install coveralls@2 && nyc report --reporter=text-lcov | coveralls"
Original file line number Diff line number Diff line change @@ -32,7 +32,7 @@ install:
32
32
catch { Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) }
33
33
- npm config set shrinkwrap false
34
34
- if "%nodejs_version%" equ "0.8" npm config set strict-ssl false
35
- - npm rm --silent --save-dev eslint nyc
35
+ - npm rm --silent --save-dev eslint
36
36
- if exist node_modules npm prune
37
37
- if exist node_modules npm rebuild
38
38
- npm install
Original file line number Diff line number Diff line change 21
21
"devDependencies" : {
22
22
"after" : " 0.8.2" ,
23
23
"eslint" : " 4.19.1" ,
24
- "nyc" : " 10.3.2" ,
25
24
"seedrandom" : " 2.4.4" ,
26
25
"timezone-mock" : " 0.0.7" ,
27
26
"urun" : " 0.0.8" ,
40
39
"scripts" : {
41
40
"lint" : " eslint ." ,
42
41
"test" : " node test/run.js" ,
43
- "test-ci" : " nyc --reporter=text npm test" ,
44
- "test-cov" : " nyc --reporter=html --reporter=text npm test" ,
42
+ "test-ci" : " node tool/install- nyc.js --nyc-optional -- reporter=text -- npm test" ,
43
+ "test-cov" : " node tool/install- nyc.js --reporter=html --reporter=text -- npm test" ,
45
44
"version" : " node tool/version-changes.js && git add Changes.md"
46
45
}
47
46
}
You can’t perform that action at this time.
0 commit comments