From 8d6d227848d0f60e92d755413dcea9cfb874053f Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Sun, 15 May 2016 20:56:54 -0500 Subject: [PATCH] =?UTF-8?q?[eslint=20config]=20[*]=20[tests]=20Even=20thou?= =?UTF-8?q?gh=20the=20base=20config=20may=20not=20be=20up=20to=20date=20in?= =?UTF-8?q?=20the=20main=20package,=20let=E2=80=99s=20`npm=20link`=20the?= =?UTF-8?q?=20base=20package=20into=20the=20main=20one=20for=20the=20sake?= =?UTF-8?q?=20of=20travis-ci=20tests.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (Followup from c7faa91328ed86f68f08bbf08bf7ccc82d48c6aa) --- .travis.yml | 2 +- package.json | 9 ++++++--- packages/eslint-config-airbnb-base/package.json | 3 ++- packages/eslint-config-airbnb/package.json | 3 ++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index c03ccdd0d5..4e625829a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ before_install: - 'if [ "${TRAVIS_NODE_VERSION}" != "0.9" ]; then case "$(npm --version)" in 1.*) npm install -g npm@1.4.28 ;; 2.*) npm install -g npm@2 ;; esac ; fi' - 'if [ "${TRAVIS_NODE_VERSION}" != "0.6" ] && [ "${TRAVIS_NODE_VERSION}" != "0.9" ]; then npm install -g npm; fi' script: - - 'npm test' + - 'npm run travis' sudo: false matrix: fast_finish: true diff --git a/package.json b/package.json index f51d8af1cb..a977f26b3d 100644 --- a/package.json +++ b/package.json @@ -4,11 +4,14 @@ "description": "A mostly reasonable approach to JavaScript.", "scripts": { "preinstall": "npm run install:config && npm run install:config:base", - "install:config": "cd packages/eslint-config-airbnb && npm install && npm install ../eslint-config-airbnb-base", - "install:config:base": "cd packages/eslint-config-airbnb-base && npm install", + "install:config": "cd packages/eslint-config-airbnb && npm prune && npm install", + "install:config:base": "cd packages/eslint-config-airbnb-base && npm prune && npm install", "test": "npm run --silent test:config && npm run --silent test:config:base", "test:config": "cd packages/eslint-config-airbnb; npm test", - "test:config:base": "cd packages/eslint-config-airbnb-base; npm test" + "test:config:base": "cd packages/eslint-config-airbnb-base; npm test", + "travis": "npm run --silent travis:config && npm run --silent travis:config:base", + "travis:config": "cd packages/eslint-config-airbnb; npm run travis", + "travis:config:base": "cd packages/eslint-config-airbnb-base; npm run travis" }, "repository": { "type": "git", diff --git a/packages/eslint-config-airbnb-base/package.json b/packages/eslint-config-airbnb-base/package.json index 1b8d36ff16..0ecf7740ba 100644 --- a/packages/eslint-config-airbnb-base/package.json +++ b/packages/eslint-config-airbnb-base/package.json @@ -7,7 +7,8 @@ "lint": "eslint .", "tests-only": "babel-tape-runner ./test/test-*.js", "pretest": "eslint-find-rules --unused", - "test": "npm run --silent lint && npm run --silent tests-only" + "test": "npm run --silent lint && npm run --silent tests-only", + "travis": "npm run --silent test" }, "repository": { "type": "git", diff --git a/packages/eslint-config-airbnb/package.json b/packages/eslint-config-airbnb/package.json index ad621d7d30..b0b6095aa5 100644 --- a/packages/eslint-config-airbnb/package.json +++ b/packages/eslint-config-airbnb/package.json @@ -7,7 +7,8 @@ "lint": "eslint .", "tests-only": "babel-tape-runner ./test/test-*.js", "pretest": "eslint-find-rules --unused", - "test": "npm run --silent lint && npm run --silent tests-only" + "test": "npm run --silent lint && npm run --silent tests-only", + "travis": "cd ../eslint-config-airbnb-base && npm link && cd - && npm link eslint-config-airbnb-base && npm run --silent test ; npm unlink eslint-config-airbnb-base >/dev/null &" }, "repository": { "type": "git",