Skip to content

Commit b5de008

Browse files
authored
Rollup merge of #106085 - fee1-dead-contrib:tidy-ci-matchers, r=pietroalbini
use problem matchers for tidy CI
2 parents a69a9b3 + a2040de commit b5de008

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
lines changed

src/ci/docker/host-x86_64/x86_64-gnu-llvm-14/Dockerfile

+1-3
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,4 @@ ENV SCRIPT ../x.py --stage 2 test --exclude src/tools/tidy && \
6262
# work.
6363
#
6464
../x.ps1 --stage 2 test tests/ui --pass=check \
65-
--host='' --target=i686-unknown-linux-gnu && \
66-
# Run tidy at the very end, after all the other tests.
67-
python2.7 ../x.py --stage 2 test src/tools/tidy
65+
--host='' --target=i686-unknown-linux-gnu
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"problemMatcher": [
3+
{
4+
"owner": "tidy-error-file-line",
5+
"pattern": [
6+
{
7+
"regexp": "^tidy error: /checkout/(.+):(\\d+): (.+)$",
8+
"file": 1,
9+
"line": 2,
10+
"message": 3
11+
}
12+
]
13+
}
14+
]
15+
}

src/ci/scripts/run-build-from-ci.sh

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
1010
export CI="true"
1111
export SRC=.
1212

13+
echo "::add-matcher::src/ci/github-actions/problem_matchers.json"
14+
1315
# Remove any preexisting rustup installation since it can interfere
1416
# with the cargotest step and its auto-detection of things like Clippy in
1517
# the environment

0 commit comments

Comments
 (0)