From aa8a82c9df3f096d92f5fc3791f743e93f09d38c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20Beltra=CC=81n=20Alarco=CC=81n?= Date: Sat, 13 Jun 2020 18:50:15 +0200 Subject: [PATCH] ci: include eslint matrix --- .travis.yml | 14 +++++++++++--- package.json | 8 ++++---- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index ded09a8b..59c618e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,26 @@ language: node_js env: - - FORCE_COLOR=true + global: + - FORCE_COLOR=true + matrix: + - ESLINT=5 + - ESLINT=6 node_js: - 10.12 - 12 - - node + - 14 + +before_script: + - 'if [ -n "${ESLINT-}" ]; then npm install --no-save "eslint@${ESLINT}" ; fi' jobs: include: - stage: release if: branch = master AND type != pull_request - node_js: 12 + node_js: 14 + env: ESLINT=6 script: npm run build deploy: provider: script diff --git a/package.json b/package.json index c5708478..103083db 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "@typescript-eslint/eslint-plugin": "^2.26.0", "@typescript-eslint/parser": "^2.26.0", "cpy-cli": "^3.1.0", - "eslint": "^6.3.0", + "eslint": "^5 || ^6", "eslint-config-prettier": "^6.1.0", "eslint-config-standard": "^14.1.0", "eslint-plugin-import": "^2.18.2", @@ -67,11 +67,11 @@ "typescript": "^3.8.3" }, "peerDependencies": { - "eslint": ">=5" + "eslint": "^5 || ^6" }, "engines": { - "node": ">=8", - "npm": ">=5" + "node": "^10.12.0 || >=12.0.0", + "npm": ">=6" }, "license": "MIT" }