diff --git a/.travis.yml b/.travis.yml index 10327d0cbe2..2ec82fccd7b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,41 +1,44 @@ sudo: false notifications: - email: false + email: false language: node_js node_js: - - "10" - - "8" - - "6" + - "10" + - "8" + - "6" cache: - directories: - - ~/.npm + directories: + - ~/.npm matrix: - include: - - os: linux - node_js: "stable" - env: JOB_PART=lint - - os: linux - node_js: "stable" - env: JOB_PART=integration - - os: linux - node_js: "10" - env: JOB_PART=integration - - os: linux - node_js: "8" - env: JOB_PART=integration - - os: linux - node_js: "6" - env: JOB_PART=integration + include: + - os: linux + node_js: "stable" + env: JOB_PART=lint + - os: linux + node_js: "stable" + env: JOB_PART=integration + - os: linux + node_js: "10" + env: JOB_PART=integration + - os: linux + node_js: "8" + env: JOB_PART=integration + - os: linux + node_js: "6" + env: JOB_PART=integration before_install: - - '[[ $(node -v) =~ ^v9.*$ ]] || npm install -g npm@latest' # skipped when using node 9 + - "[[ $(node -v) =~ ^v9.*$ ]] || npm install -g npm@latest" # skipped when using node 9 install: - - travis_wait npm ci - - npm install -g codecov - - npm install -g eslint + - travis_wait npm ci + - npm install -g codecov + - npm install -g eslint +script: + - npm run travis:lint + - npm run test:ci jobs: - include: - - stage: commit lint - script: commitlint-travis + include: + - stage: commit lint + script: commitlint-travis diff --git a/commitlint.config.js b/commitlint.config.js index e5ac86ba709..0bb49930e3f 100644 --- a/commitlint.config.js +++ b/commitlint.config.js @@ -12,7 +12,6 @@ module.exports = { "body-leading-blank": [1, "always"], "footer-leading-blank": [1, "always"], "header-max-length": [2, "always", 80], - lang: [0, "always", "eng"], "scope-case": [2, "always", "lowerCase"], "scope-empty": [0, "never"], "subject-case": [2, "never", ["sentence-case", "start-case", "pascal-case", "upper-case"]], diff --git a/package.json b/package.json index 8f4f991c138..948e128bc7e 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "test": "nyc jest --maxWorkers=4 --reporters=default --reporters=jest-junit", "test:ci": "nyc jest --maxWorkers=$(nproc) --reporters=default --reporters=jest-junit", "travis:integration": "npm run build && npm run test && npm run reportCoverage", - "travis:lint": "lerna bootstrap && npm run build && npm run lint && npm run tslint && npm run bundlesize", + "travis:lint": "lerna bootstrap && npm run build && npm run lint && npm run tslint", "tslint": "tslint -c tslint.json \"packages/**/*.ts\"", "watch": "npm run build && tsc -w", "postinstall": "lightercollective"