test

README.md

@@ -1,42 +1,19 @@
-# GCC problem matcher (no longer maintained)
-
-> **Warning**
-> 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)
+# GCC problem matcher
 
 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.
-
-```yaml
-    - uses: olemorud/gcc-problem-matcher@v1.0
-    
-    - name: Build
-      run: |
-        ...
-```
-
-Create annotations for builds done in directory `/workspace/build/`
+Just add this line anywhere before running the build step.
 
 ```yaml
     - uses: olemorud/gcc-problem-matcher@master
       with:
-        build-directory: /workspace/build/
-        
-    - name: Build
-      run: |
-         ...
-```
+        root: /workspace/build
+```

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

src/gcc_matcher.jsontemplate

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