Add fromPath to matcher template

This commit is contained in:
olemorud
2023-03-14 17:38:18 +01:00
parent 8a8f3dcf06
commit e758cb8cf0
3 changed files with 9 additions and 8 deletions

View File

@@ -23,7 +23,7 @@ jobs:
- name: Apply problem matcher - name: Apply problem matcher
uses: ./ uses: ./
with: with:
build-directory: "" build-directory: build/
- name: Test problem matcher - name: Test problem matcher
run: | run: |

View File

@@ -4,12 +4,13 @@
"owner": "gcc-problem-matcher", "owner": "gcc-problem-matcher",
"pattern": [ "pattern": [
{ {
"regexp": "^.*?${{ BASE }}\/?(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$", "regexp": "^(${{ BASE }})(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
"file": 1, "fromPath": 1,
"line": 2, "file": 2,
"column": 3, "line": 3,
"severity": 4, "column": 4,
"message": 5 "severity": 5,
"message": 6
} }
] ]
} }

View File

@@ -21,7 +21,7 @@ const matcherPath = path.join(__dirname, "gcc_matcher.json");
// rootdir :: string // rootdir :: string
const rootdir = core.getInput('build-directory', {required: false}); const rootdir = core.getInput('build-directory', {required: false});
// parse :: IO() => IO() => Error | null // parse :: string => string => Error | null
const parse = (templatePath) => (matcherPath) => { const parse = (templatePath) => (matcherPath) => {
const content = fs.readFileSync(templatePath, 'utf-8'); const content = fs.readFileSync(templatePath, 'utf-8');