From 0430c6ccc8d17f4313356b1387cb308ce8d4b9be Mon Sep 17 00:00:00 2001
From: Brennan Ashton <bashton@brennanashton.com>
Date: Sun, 31 May 2020 14:19:21 -0700
Subject: [PATCH] Add problem matching for gcc and nxstyle to github actions

---
 .github/gcc.json            | 28 ++++++++++++++++++++++++++++
 .github/nxstyle.json        | 28 ++++++++++++++++++++++++++++
 .github/workflows/build.yml |  2 ++
 .github/workflows/check.yml |  1 +
 tools/checkpatch.sh         |  2 +-
 5 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 .github/gcc.json
 create mode 100644 .github/nxstyle.json

diff --git a/.github/gcc.json b/.github/gcc.json
new file mode 100644
index 0000000000..c13c7b40d2
--- /dev/null
+++ b/.github/gcc.json
@@ -0,0 +1,28 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+{
+  "problemMatcher": [
+    {
+      "owner": "gcc",
+      "pattern": [
+        {
+          "regexp": "^(.*):(\\d+):(\\d+):\\s+(warning|fatal error|error):\\s+(.*)$",
+          "file": 1,
+          "line": 2,
+          "column": 3,
+          "severity": 4,
+          "message": 5
+	}
+      ]
+    }
+  ]
+}
diff --git a/.github/nxstyle.json b/.github/nxstyle.json
new file mode 100644
index 0000000000..fdad998d1a
--- /dev/null
+++ b/.github/nxstyle.json
@@ -0,0 +1,28 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+{
+  "problemMatcher": [
+    {
+      "owner": "nxstyle",
+      "pattern": [
+        {
+          "regexp": "^(.*):(\\d+):(\\d+):\\s+(warning|error):\\s+(.*)$",
+          "file": 1,
+          "line": 2,
+          "column": 3,
+          "severity": 4,
+          "message": 5
+	}
+      ]
+    }
+  ]
+}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1b4cceeddd..de11c0f1a7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -179,6 +179,7 @@ jobs:
           BLOBDIR: /tools/blobs
         with:
           run: |
+            echo "::add-matcher::sources/nuttx/.github/gcc.json"
             cd sources/testing
             ./cibuild.sh -x testlist/${{matrix.boards}}.dat
 
@@ -230,5 +231,6 @@ jobs:
         run: git -C sources/nuttx fetch --tags
       - name: Run Builds
         run: |
+          echo "::add-matcher::sources/nuttx/.github/gcc.json"
           cd sources/testing
           ./cibuild.sh -i -x testlist/${{matrix.boards}}.dat
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 242496af91..9f031bfff6 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -29,6 +29,7 @@ jobs:
 
     - name: Check Pull Request
       run: |
+        echo "::add-matcher::nuttx/.github/nxstyle.json"
         cd nuttx
         commits=`git log -1 --merges --pretty=format:%P | awk -F" " '{ print $1 ".." $2 }'`
         git log --oneline $commits
diff --git a/tools/checkpatch.sh b/tools/checkpatch.sh
index 6c10fd43ae..5226e227ed 100755
--- a/tools/checkpatch.sh
+++ b/tools/checkpatch.sh
@@ -63,7 +63,7 @@ check_ranges() {
           check_file $path
         fi
       fi
-      path=${BASH_REMATCH[3]}
+      path=$(realpath "${BASH_REMATCH[3]}")
       ranges=""
     elif [[ $REPLY =~ @@\ -[0-9]+(,[0-9]+)?\ \+([0-9]+,[0-9]+)?\ @@.* ]]; then
       ranges+="-r ${BASH_REMATCH[2]} "