[refactor] Simplify regex

.github/workflows/CI.yml

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

README.md

@@ -1,42 +1,21 @@
-# GCC problem matcher (no longer maintained)
+# GCC problem matcher
 
-> **Warning**
+# DO NOT COMMIT THIS LINE
-> This repository is no longer maintained, the new upstream is: https://github.com/root-project/gcc-problem-matcher-improved
-
-[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Folemorud%2Fgcc-problem-matcher.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Folemorud%2Fgcc-problem-matcher?ref=badge_shield)
 
 Creates annotations for warnings and errors in gcc builds.
 
-![image](https://user-images.githubusercontent.com/82065181/225907856-336fa631-6520-44ce-bdf5-cf5780e45e40.png)
-
-
-
 ## Inputs
 
-### build-directory
+### root
 
-**Optional** Directory the build is running in. Matched errors will not be able to point to the correct file or create warnings in the `Files changed` overview unless this is correct.
+**Optional** Base directory for build. For builds done in a subdirectory, this should match that directory, otherwise the pattern match will not be able to point to the correct file.
 
 ## Example usage
 
-Create annotations for builds done in the default directory. Add this anywhere before starting the build.
+Just add this line anywhere before running the build step.
-
-```yaml
-    - uses: olemorud/gcc-problem-matcher@v1.0
-    
-    - name: Build
-      run: |
-        ...
-```
-
-Create annotations for builds done in directory `/workspace/build/`
 
 ```yaml
     - uses: olemorud/gcc-problem-matcher@master
       with:
-        build-directory: /workspace/build/
+        root: /workspace/build
-        
+```
-    - name: Build
-      run: |
-         ...
-```

action.yml

@@ -1,6 +1,6 @@
-name: GCC Problem Matcher Improved (deprecated)
+name: GCC Problem Matcher
 
-description: new upstream: https://github.com/root-project/gcc-problem-matcher-improved
+description: Get annotations for warnings and errors on builds using gcc
 
 author: Ole Morud
 
@@ -11,8 +11,8 @@ branding:
 inputs:
   build-directory:
     description: 'base directory for build, e.g. /workdir/build'
-    required: false
+    required: true
 
 runs:
   using: 'node16'
-  main: 'dist/index.js'
+  main: 'dist/index.js'

dist/gcc_matcher.jsontemplate

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

dist/index.js

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

src/gcc_matcher.jsontemplate

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

src/index.js

@@ -5,7 +5,7 @@ const core = require('@actions/core');
 // escapeRegExp :: string => string
 // escape all characters with special meanings in regexp
 const escapeRegExp = (s) =>
-	s.replace(/[/\-^$*+?.()|[\]{}]/g, "\\\\$&");
+	s.replace(/[/\-^$*+?.()|[\]{}]/g, "\\$&");
 
 // variable :: string => RegExp
 // create regex to match ${{ key }}
@@ -16,12 +16,12 @@ const variable = (key) =>
 const templatePath = path.join(__dirname, "gcc_matcher.jsontemplate");
 
 // matcherPath :: string
-const outputPath = path.join(__dirname, "gcc_matcher.json");
+const matcherPath = path.join(__dirname, "gcc_matcher.json");
 
 // rootdir :: string
 const rootdir = core.getInput('build-directory', {required: false});
 
-// parse :: string => string => Error | null
+// parse :: IO() => IO() => Error | null
 const parse = (templatePath) => (matcherPath) => {
 	const content = fs.readFileSync(templatePath, 'utf-8');
 
@@ -34,7 +34,7 @@ const parse = (templatePath) => (matcherPath) => {
 
 // main:
 try {
-	parse(templatePath)(outputPath);
+	parse(templatePath)(matcherPath);
 } catch (err) {
 	core.setFailed(`Action failed with error ${err}`)
 }