@@ -83,7 +83,11 @@ fi
 # Try building the application (+e as we want to test every example and get a
 # summary on what is working)
 set +e
-pio --no-ansi run -d "$PROJECTDIR" -e "$BOARD" 2>&1 | "$CIDIR/scripts/pio-to-gh-log.py"
+pio --no-ansi run -d "$PROJECTDIR" -e "$BOARD" 2>&1 | \
+  "$CIDIR/scripts/pio-to-gh-log.py" \
+    "src/main.cpp:examples/$EXAMPLENAME/$EXAMPLENAME.ino:-1" \
+    "lib/esp32_https_server/:src/" \
+    "$REPODIR/:"
 RC=${PIPESTATUS[0]}
 if [[ "$RC" != "0" ]]; then
   echo "::error::pio returned with RC=$RC"
 
@@ -7,10 +7,26 @@
 
 re_err = re.compile(r"^([^:]+):([0-9]+):([0-9]+): error: (.*)$")
 
+# Parameters are strings of the form
+# path_prefix:replacement_prefix:line_offset
+# Where all paths starting with path_prefix will be replced with replacement_prefix,
+# and if such a replacement takes place, the line number will be shifted by line_offset.
+# That allows taking care for inserted code like the #include <Arduino.h>
+mappings = []
+for arg in sys.argv[1:]:
+  parts = arg.split(":", 2)
+  mappings.append((*parts[0:2], 0 if len(parts)==2 else int(parts[2])))
+
 for line in sys.stdin:
   print(line, end="")
   m = re_err.match(line.strip())
   if m is not None:
+    name = m.group(1)
+    lineno = int(m.group(2))
+    for mapping in mappings:
+      if name.startswith(mapping[0]):
+        name = mapping[1] + name[len(mapping[0]):]
+        lineno += mapping[2]
     print("::error file={name},line={line},col={col}::{message}".format(
-      name=m.group(1), line=m.group(2), col=m.group(3), message=m.group(4)
+      name=name, line=lineno, col=m.group(3), message=m.group(4)
     ))