Skip to content

Commit 946727b

Browse files
committed
build: install nyc on demand
1 parent 0420029 commit 946727b

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

.travis.yml

+4-6
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ before_install:
5656
- "npm config set shrinkwrap false"
5757

5858
# 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"
6160
- "test $(echo $TRAVIS_NODE_VERSION | cut -d. -f1) -ge 4 || npm rm --save-dev eslint"
6261

6362
# Update Node.js modules
@@ -78,10 +77,9 @@ before_script:
7877
- "docker exec mysql mysql -e 'select version()'"
7978

8079
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"
8583

8684
after_script:
8785
- "test -d .nyc_output && npm install coveralls@2 && nyc report --reporter=text-lcov | coveralls"

appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ install:
3232
catch { Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) }
3333
- npm config set shrinkwrap false
3434
- 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
3636
- if exist node_modules npm prune
3737
- if exist node_modules npm rebuild
3838
- npm install

package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
"devDependencies": {
2222
"after": "0.8.2",
2323
"eslint": "4.19.1",
24-
"nyc": "10.3.2",
2524
"seedrandom": "2.4.4",
2625
"timezone-mock": "0.0.7",
2726
"urun": "0.0.8",
@@ -40,8 +39,8 @@
4039
"scripts": {
4140
"lint": "eslint .",
4241
"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",
4544
"version": "node tool/version-changes.js && git add Changes.md"
4645
}
4746
}

0 commit comments

Comments
 (0)