From e2d9812c04ce8ba7ed99ac69d4cddf8152eaad74 Mon Sep 17 00:00:00 2001 From: Danny McCormick Date: Tue, 18 Jun 2019 10:50:43 -0400 Subject: [PATCH] Add eslint problem matchers (#10) * Add eslint problem matchers * Use absolute paths --- .github/eslint-compact.json | 18 +++++++++++++++++ .github/eslint-stylish.json | 40 +++++++++++++++++++++++++++++++++++++ lib/setup-node.js | 6 +++++- src/setup-node.ts | 10 +++++++++- 4 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 .github/eslint-compact.json create mode 100644 .github/eslint-stylish.json diff --git a/.github/eslint-compact.json b/.github/eslint-compact.json new file mode 100644 index 00000000..dd151e12 --- /dev/null +++ b/.github/eslint-compact.json @@ -0,0 +1,18 @@ +{ + "problemMatcher": [ + { + "owner": "tsc", + "pattern": [ + { + "regexp": "/^(.+):\\sline\\s(\\d+),\\scol\\s(\\d+),\\s(Error|Warning|Info)\\s-\\s(.+)\\s\\((.+)\\)$/", + "file": 1, + "line": 2, + "character": 3, + "severity": 4, + "message": 5, + "code": 6 + } + ] + } + ] +} \ No newline at end of file diff --git a/.github/eslint-stylish.json b/.github/eslint-stylish.json new file mode 100644 index 00000000..9574eafe --- /dev/null +++ b/.github/eslint-stylish.json @@ -0,0 +1,40 @@ +{ + "problemMatcher": [ + { + "owner": "eslint-stylish", + "pattern": [ + { + "regexp": "^([^\\s].*)$", + "file": 1 + }, + { + "regexp": "^\\s+(\\d+):(\\d+)\\s+(error|warning|info)\\s+(.*)\\s\\s+(.*)$", + "line": 1, + "column": 2, + "severity": 3, + "message": 4, + "code": 5, + "loop": true + } + ] + }, + { + "owner": "eslint-stylish", + "pattern": [ + { + "regexp": "^([^\\s].*)$", + "file": 1 + }, + { + "regexp": "^\\s+(\\d+):(\\d+)\\s+(error|warning|info)\\s+(.*)\\s\\s+(.*)$", + "line": 1, + "column": 2, + "severity": 3, + "message": 4, + "code": 5, + "loop": true + } + ] + } + ] +} \ No newline at end of file diff --git a/lib/setup-node.js b/lib/setup-node.js index 10614ba5..b59c4b3d 100644 --- a/lib/setup-node.js +++ b/lib/setup-node.js @@ -17,6 +17,7 @@ var __importStar = (this && this.__importStar) || function (mod) { Object.defineProperty(exports, "__esModule", { value: true }); const core = __importStar(require("@actions/core")); const installer = __importStar(require("./installer")); +const path = __importStar(require("path")); function run() { return __awaiter(this, void 0, void 0, function* () { try { @@ -30,7 +31,10 @@ function run() { yield installer.getNode(version); } // TODO: setup proxy from runner proxy config - console.log('##[add-matcher].github/tsc.json'); + const matchersPath = path.join(__dirname, '..', '.github'); + console.log(`##[add-matcher]${path.join(matchersPath, 'tsc.json')}`); + console.log(`##[add-matcher]${path.join(matchersPath, 'eslint-stylish.json')}`); + console.log(`##[add-matcher]${path.join(matchersPath, 'eslint-compact.json')}`); } catch (error) { core.setFailed(error.message); diff --git a/src/setup-node.ts b/src/setup-node.ts index 18625d8f..c3dcd37d 100644 --- a/src/setup-node.ts +++ b/src/setup-node.ts @@ -1,5 +1,6 @@ import * as core from '@actions/core'; import * as installer from './installer'; +import * as path from 'path'; async function run() { try { @@ -14,7 +15,14 @@ async function run() { } // TODO: setup proxy from runner proxy config - console.log('##[add-matcher].github/tsc.json'); + const matchersPath = path.join(__dirname, '..', '.github'); + console.log(`##[add-matcher]${path.join(matchersPath, 'tsc.json')}`); + console.log( + `##[add-matcher]${path.join(matchersPath, 'eslint-stylish.json')}` + ); + console.log( + `##[add-matcher]${path.join(matchersPath, 'eslint-compact.json')}` + ); } catch (error) { core.setFailed(error.message); }