olemorud/gcc-problem-matcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[feat] Make regex eat trailing '/' in group 1

Browse Source
This commit is contained in:
olemorud
2023-03-15 10:56:44 +01:00
parent dd72791927
commit ae82e15273
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dist/gcc_matcher.jsontemplate vendored
View File

@@ -4,7 +4,7 @@
"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+(.*)$",
"fromPath": 1, "fromPath": 1,
"file": 2, "file": 2,
"line": 3, "line": 3,

4
dist/index.js vendored
View File

@@ -2848,7 +2848,7 @@ const core = __nccwpck_require__(127);
// escapeRegExp :: string => string // escapeRegExp :: string => string
// escape all characters with special meanings in regexp // escape all characters with special meanings in regexp
const escapeRegExp = (s) => const escapeRegExp = (s) =>
s.replace(/[/\-^$*+?.()|[\]{}]/g, "\\$&"); s.replace(/[/\-^$*+?.()|[\]{}]/g, "\\\\$&");
// variable :: string => RegExp // variable :: string => RegExp
// create regex to match ${{ key }} // create regex to match ${{ key }}
@@ -2859,7 +2859,7 @@ const variable = (key) =>
const templatePath = __nccwpck_require__.ab + "gcc_matcher.jsontemplate"; const templatePath = __nccwpck_require__.ab + "gcc_matcher.jsontemplate";
// matcherPath :: string // matcherPath :: string
const matcherPath = __nccwpck_require__.ab + "gcc_matcher.json"; const outputPath = __nccwpck_require__.ab + "gcc_matcher.json";
// rootdir :: string // rootdir :: string
const rootdir = core.getInput('build-directory', {required: false}); const rootdir = core.getInput('build-directory', {required: false});

2
src/gcc_matcher.jsontemplate
View File

@@ -4,7 +4,7 @@
"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+(.*)$",
"fromPath": 1, "fromPath": 1,
"file": 2, "file": 2,
"line": 3, "line": 3,

6
src/index.js
View File

@@ -5,7 +5,7 @@ const core = require('@actions/core');
// escapeRegExp :: string => string // escapeRegExp :: string => string
// escape all characters with special meanings in regexp // escape all characters with special meanings in regexp
const escapeRegExp = (s) => const escapeRegExp = (s) =>
s.replace(/[/\-^$*+?.()|[\]{}]/g, "\\$&"); s.replace(/[/\-^$*+?.()|[\]{}]/g, "\\\\$&");
// variable :: string => RegExp // variable :: string => RegExp
// create regex to match ${{ key }} // create regex to match ${{ key }}
@@ -16,7 +16,7 @@ const variable = (key) =>
const templatePath = path.join(__dirname, "gcc_matcher.jsontemplate"); const templatePath = path.join(__dirname, "gcc_matcher.jsontemplate");
// matcherPath :: string // matcherPath :: string
const matcherPath = path.join(__dirname, "gcc_matcher.json"); const outputPath = 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});
@@ -34,7 +34,7 @@ const parse = (templatePath) => (matcherPath) => {
// main: // main:
try { try {
parse(templatePath)(matcherPath); parse(templatePath)(outputPath);
} catch (err) { } catch (err) {
core.setFailed(`Action failed with error ${err}`) core.setFailed(`Action failed with error ${err}`)
} }