File tree Expand file tree Collapse file tree 4 files changed +7
-7
lines changed Expand file tree Collapse file tree 4 files changed +7
-7
lines changed Original file line number Diff line number Diff line change 4
4
"owner": "gcc-problem-matcher",
5
5
"pattern": [
6
6
{
7
- "regexp": "^(${{ BASE }})(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
7
+ "regexp": "^(${{ BASE }}\\/? )(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
8
8
"fromPath": 1,
9
9
"file": 2,
10
10
"line": 3,
Original file line number Diff line number Diff line change @@ -2848,7 +2848,7 @@ const core = __nccwpck_require__(127);
2848
2848
// escapeRegExp :: string => string
2849
2849
// escape all characters with special meanings in regexp
2850
2850
const escapeRegExp = ( s ) =>
2851
- s . replace ( / [ / \- ^ $ * + ? . ( ) | [ \] { } ] / g, "\\$&" ) ;
2851
+ s . replace ( / [ / \- ^ $ * + ? . ( ) | [ \] { } ] / g, "\\\\ $&" ) ;
2852
2852
2853
2853
// variable :: string => RegExp
2854
2854
// create regex to match ${{ key }}
@@ -2859,7 +2859,7 @@ const variable = (key) =>
2859
2859
const templatePath = __nccwpck_require__ . ab + "gcc_matcher.jsontemplate" ;
2860
2860
2861
2861
// matcherPath :: string
2862
- const matcherPath = __nccwpck_require__ . ab + "gcc_matcher.json" ;
2862
+ const outputPath = __nccwpck_require__ . ab + "gcc_matcher.json" ;
2863
2863
2864
2864
// rootdir :: string
2865
2865
const rootdir = core . getInput ( 'build-directory' , { required : false } ) ;
Original file line number Diff line number Diff line change 4
4
"owner": "gcc-problem-matcher",
5
5
"pattern": [
6
6
{
7
- "regexp": "^(${{ BASE }})(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
7
+ "regexp": "^(${{ BASE }}\\/? )(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
8
8
"fromPath": 1,
9
9
"file": 2,
10
10
"line": 3,
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ const core = require('@actions/core');
5
5
// escapeRegExp :: string => string
6
6
// escape all characters with special meanings in regexp
7
7
const escapeRegExp = ( s ) =>
8
- s . replace ( / [ / \- ^ $ * + ? . ( ) | [ \] { } ] / g, "\\$&" ) ;
8
+ s . replace ( / [ / \- ^ $ * + ? . ( ) | [ \] { } ] / g, "\\\\ $&" ) ;
9
9
10
10
// variable :: string => RegExp
11
11
// create regex to match ${{ key }}
@@ -16,7 +16,7 @@ const variable = (key) =>
16
16
const templatePath = path . join ( __dirname , "gcc_matcher.jsontemplate" ) ;
17
17
18
18
// matcherPath :: string
19
- const matcherPath = path . join ( __dirname , "gcc_matcher.json" ) ;
19
+ const outputPath = path . join ( __dirname , "gcc_matcher.json" ) ;
20
20
21
21
// rootdir :: string
22
22
const rootdir = core . getInput ( 'build-directory' , { required : false } ) ;
@@ -34,7 +34,7 @@ const parse = (templatePath) => (matcherPath) => {
34
34
35
35
// main:
36
36
try {
37
- parse ( templatePath ) ( matcherPath ) ;
37
+ parse ( templatePath ) ( outputPath ) ;
38
38
} catch ( err ) {
39
39
core . setFailed ( `Action failed with error ${ err } ` )
40
40
}
You can’t perform that action at this time.
0 commit comments