diff --git a/.azure-pipelines/lint-job.yml b/.azure-pipelines/lint-job.yml index 08221c3..34db20b 100644 --- a/.azure-pipelines/lint-job.yml +++ b/.azure-pipelines/lint-job.yml @@ -7,7 +7,7 @@ jobs: - task: NodeTool@0 displayName: Install Node.js inputs: - versionSpec: 12.x + versionSpec: 14 - script: npm install displayName: Install Packages diff --git a/.azure-pipelines/website-job.yml b/.azure-pipelines/website-job.yml index fc88950..e356746 100644 --- a/.azure-pipelines/website-job.yml +++ b/.azure-pipelines/website-job.yml @@ -8,7 +8,7 @@ jobs: - task: NodeTool@0 displayName: Install Node.js inputs: - versionSpec: 12.x + versionSpec: 14.x - script: npm install displayName: Install Packages diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a84ac90..49b5d45 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -6,60 +6,75 @@ jobs: - template: .azure-pipelines/test-job.yml parameters: - name: test_on_linux_node12_eslint5 - displayName: Test on Node 12, ESLint 5, Linux + name: test_on_linux_node14_eslint7 + displayName: Test on Node 14, ESLint 7, Linux vmImage: Ubuntu-16.04 - nodeVersion: 12.x + nodeVersion: 14 - template: .azure-pipelines/test-job.yml parameters: - name: test_on_linux_node10_eslint5 - displayName: Test on Node 10, ESLint 5, Linux + name: test_on_linux_node12_eslint7 + displayName: Test on Node 12, ESLint 7, Linux vmImage: Ubuntu-16.04 - nodeVersion: 10.x + nodeVersion: 12 - template: .azure-pipelines/test-job.yml parameters: - name: test_on_linux_node8_eslint5 - displayName: Test on Node 8, ESLint 5, Linux + name: test_on_linux_node120_eslint7 + displayName: Test on Node 12.0, ESLint 7, Linux vmImage: Ubuntu-16.04 - nodeVersion: 8.x + nodeVersion: 12.0 - template: .azure-pipelines/test-job.yml parameters: - name: test_on_linux_node6_eslint5 - displayName: Test on Node 6, ESLint 5, Linux + name: test_on_linux_node10_eslint7 + displayName: Test on Node 10, ESLint 7, Linux vmImage: Ubuntu-16.04 - nodeVersion: 6.x + nodeVersion: 10 - template: .azure-pipelines/test-job.yml parameters: - name: test_on_linux_node12_eslint4 - displayName: Test on Node 12, ESLint 4, Linux + name: test_on_linux_node1012_eslint7 + displayName: Test on Node 10.12, ESLint 7, Linux vmImage: Ubuntu-16.04 - nodeVersion: 12.x - eslintVersion: 4.x + nodeVersion: 10.12 - template: .azure-pipelines/test-job.yml parameters: - name: test_on_linux_node12_eslint6rc - displayName: Test on Node 12, ESLint 6 RC, Linux + name: test_on_linux_node14_eslint6 + displayName: Test on Node 14, ESLint 6, Linux vmImage: Ubuntu-16.04 - nodeVersion: 12.x - eslintVersion: ^6.0.0-rc.0 + nodeVersion: 14 + eslintVersion: 6 - template: .azure-pipelines/test-job.yml parameters: - name: test_on_windows_node12_eslint5 - displayName: Test on Node 12, ESLint 5, Windows + name: test_on_linux_node14_eslint5 + displayName: Test on Node 14, ESLint 5, Linux + vmImage: Ubuntu-16.04 + nodeVersion: 14 + eslintVersion: 5 + + - template: .azure-pipelines/test-job.yml + parameters: + name: test_on_linux_node14_eslint4 + displayName: Test on Node 14, ESLint 4, Linux + vmImage: Ubuntu-16.04 + nodeVersion: 14 + eslintVersion: 4 + + - template: .azure-pipelines/test-job.yml + parameters: + name: test_on_windows_node14_eslint7 + displayName: Test on Node 14, ESLint 7, Windows vmImage: Windows-2019 - nodeVersion: 12.x + nodeVersion: 14 - template: .azure-pipelines/test-job.yml parameters: - name: test_on_macos_node12_eslint5 - displayName: Test on Node 12, ESLint 5, macOS + name: test_on_macos_node14_eslint7 + displayName: Test on Node 14, ESLint 7, MacOs vmImage: macOS-10.14 - nodeVersion: 12.x + nodeVersion: 14 - template: .azure-pipelines/website-job.yml diff --git a/package.json b/package.json index d9f98b6..7a8d2b1 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "3.1.2", "description": "Additional ESLint rules for ESLint directive comments.", "engines": { - "node": ">=6.5.0" + "node": "^10.12.0 || >=12.0.0" }, "main": "index.js", "files": [ @@ -23,7 +23,7 @@ "babel-eslint": "^10.0.1", "codecov": "^3.3.0", "cross-spawn": "^6.0.5", - "eslint": "^5.12.0", + "eslint": "^7.0.0", "eslint4b": "^5.12.0", "fs-extra": "^8.0.1", "mocha": "^6.1.4",