File tree Expand file tree Collapse file tree 3 files changed +7
-7
lines changed Expand file tree Collapse file tree 3 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -2848,7 +2848,7 @@ const core = __nccwpck_require__(127);
28482848// escapeRegExp :: string => string
28492849// escape all characters with special meanings in regexp
28502850const escapeRegExp = ( s ) =>
2851- s . replace ( / [ / \- ^ $ * + ? . ( ) | [ \] { } ] / g, "\\$&" ) ;
2851+ s . replace ( / [ / \- ^ $ * + ? . ( ) | [ \] { } ] / g, "\\\\ $&" ) ;
28522852
28532853// variable :: string => RegExp
28542854// create regex to match ${{ key }}
@@ -2859,10 +2859,10 @@ const variable = (key) =>
28592859const templatePath = __nccwpck_require__ . ab + "gcc_matcher.jsontemplate" ;
28602860
28612861// matcherPath :: string
2862- const matcherPath = __nccwpck_require__ . ab + "gcc_matcher.json" ;
2862+ const outputPath = __nccwpck_require__ . ab + "gcc_matcher.json" ;
28632863
28642864// rootdir :: string
2865- const rootdir = core . getInput ( 'build-directory' , { required : false } ) ;
2865+ const rootdir = core . getInput ( 'build-directory' , { required : false } ) || "test/" ;
28662866
28672867// parse :: string => string => Error | null
28682868const parse = ( templatePath ) => ( matcherPath ) => {
Original file line number Diff line number Diff line change 44 "owner": "gcc-problem-matcher",
55 "pattern": [
66 {
7- "regexp": "^(${{ BASE }})(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
7+ "regexp": "^(${{ BASE }}\\/? )(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
88 "fromPath": 1,
99 "file": 2,
1010 "line": 3,
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ const core = require('@actions/core');
55// escapeRegExp :: string => string
66// escape all characters with special meanings in regexp
77const escapeRegExp = ( s ) =>
8- s . replace ( / [ / \- ^ $ * + ? . ( ) | [ \] { } ] / g, "\\$&" ) ;
8+ s . replace ( / [ / \- ^ $ * + ? . ( ) | [ \] { } ] / g, "\\\\ $&" ) ;
99
1010// variable :: string => RegExp
1111// create regex to match ${{ key }}
@@ -16,7 +16,7 @@ const variable = (key) =>
1616const templatePath = path . join ( __dirname , "gcc_matcher.jsontemplate" ) ;
1717
1818// matcherPath :: string
19- const matcherPath = path . join ( __dirname , "gcc_matcher.json" ) ;
19+ const outputPath = path . join ( __dirname , "gcc_matcher.json" ) ;
2020
2121// rootdir :: string
2222const rootdir = core . getInput ( 'build-directory' , { required : false } ) ;
@@ -34,7 +34,7 @@ const parse = (templatePath) => (matcherPath) => {
3434
3535// main:
3636try {
37- parse ( templatePath ) ( matcherPath ) ;
37+ parse ( templatePath ) ( outputPath ) ;
3838} catch ( err ) {
3939 core . setFailed ( `Action failed with error ${ err } ` )
4040}
You can’t perform that action at this time.
0 commit comments