Skip to content

Commit d8ed5d0

Browse files
committed
Merge pull request godotengine#99770 from Repiteo/ci/problem-matcher-expanded
CI: Add explicit problem matchers
2 parents 0b2b8f0 + 357679c commit d8ed5d0

File tree

5 files changed

+42
-15
lines changed

5 files changed

+42
-15
lines changed

.github/actions/godot-deps/action.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,7 @@ runs:
2929
python -c "import sys; print(sys.version)"
3030
python -m pip install scons==${{ inputs.scons-version }}
3131
scons --version
32+
33+
- name: Setup problem matchers
34+
shell: bash
35+
run: echo ::add-matcher::misc/utility/problem-matchers.json

.github/workflows/godot_cpp_test.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ jobs:
2121
- name: Checkout
2222
uses: actions/checkout@v4
2323
with:
24-
sparse-checkout: .github
24+
sparse-checkout: |
25+
.github
26+
misc/utility/problem-matchers.json
2527
2628
- name: Checkout godot-cpp
2729
uses: actions/checkout@v4
@@ -34,9 +36,6 @@ jobs:
3436
- name: Setup Python and SCons
3537
uses: ./.github/actions/godot-deps
3638

37-
- name: Setup GCC problem matcher
38-
uses: ammaraskar/gcc-problem-matcher@master
39-
4039
- name: Download GDExtension interface and API dump
4140
uses: ./.github/actions/download-artifact
4241
with:

.github/workflows/linux_builds.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,6 @@ jobs:
133133
python-version: 3.8
134134
scons-version: 4.0
135135

136-
- name: Setup GCC problem matcher
137-
uses: ammaraskar/gcc-problem-matcher@master
138-
139136
- name: Compilation
140137
uses: ./.github/actions/godot-build
141138
with:
@@ -158,6 +155,9 @@ jobs:
158155
- name: Build .NET solutions
159156
if: matrix.build-mono
160157
run: |
158+
# FIXME: C# warnings should be properly handled eventually, but we don't want to clutter
159+
# the GitHub Actions annotations, so remove the associated problem matcher for now.
160+
echo "::remove-matcher owner=msvc::"
161161
./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=linuxbsd
162162
163163
- name: Prepare artifact

.github/workflows/windows_builds.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,6 @@ jobs:
8686
- name: Extract pre-built ANGLE static libraries
8787
run: Expand-Archive -Force angle/angle.zip ${{ github.workspace }}/
8888

89-
- name: Setup MSVC problem matcher
90-
if: matrix.compiler == 'msvc'
91-
uses: ammaraskar/msvc-problem-matcher@master
92-
93-
- name: Setup GCC problem matcher
94-
if: matrix.compiler != 'msvc'
95-
uses: ammaraskar/gcc-problem-matcher@master
96-
9789
- name: Compilation
9890
uses: ./.github/actions/godot-build
9991
with:

misc/utility/problem-matchers.json

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"problemMatcher": [
3+
{
4+
"owner": "gcc",
5+
"pattern": [
6+
{
7+
"regexp": "^(?:\\s+\\d+\\>)?(\\S.*?)[\\(:](\\d+)[,:]?(\\d*)(?::{\\d+:\\d+\\-\\d+:\\d+})?\\)?:\\s+(?:fatal\\s+)?(error|warning|info):\\s+(.*?)(?:\\s*\\[(.*)\\])?$",
8+
"file": 1,
9+
"line": 2,
10+
"column": 3,
11+
"severity": 4,
12+
"message": 5,
13+
"code": 6
14+
}
15+
]
16+
},
17+
{
18+
"owner": "msvc",
19+
"pattern": [
20+
{
21+
"regexp": "^(?:\\s+\\d+\\>)?(\\S.*)\\((\\d+),?(\\d*)?(?:,\\d+,\\d+)?\\)\\s*:\\s+(?:fatal\\s+)?(error|warning|info)\\s+(\\w{1,2}\\d+)\\s*:\\s*(.*)$",
22+
"file": 1,
23+
"line": 2,
24+
"column": 3,
25+
"severity": 4,
26+
"code": 5,
27+
"message": 6
28+
}
29+
]
30+
}
31+
]
32+
}

0 commit comments

Comments
 (0)