Skip to content

Commit

Permalink
Rollup merge of rust-lang#106085 - fee1-dead-contrib:tidy-ci-matchers…
Browse files Browse the repository at this point in the history
…, r=pietroalbini

use problem matchers for tidy CI
  • Loading branch information
matthiaskrgr authored Mar 8, 2023
2 parents 38b9655 + a2040de commit 62c95fd
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 3 deletions.
4 changes: 1 addition & 3 deletions src/ci/docker/host-x86_64/x86_64-gnu-llvm-14/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,4 @@ ENV SCRIPT ../x.py --stage 2 test --exclude src/tools/tidy && \
# work.
#
../x.ps1 --stage 2 test tests/ui --pass=check \
--host='' --target=i686-unknown-linux-gnu && \
# Run tidy at the very end, after all the other tests.
python2.7 ../x.py --stage 2 test src/tools/tidy
--host='' --target=i686-unknown-linux-gnu
15 changes: 15 additions & 0 deletions src/ci/github-actions/problem_matchers.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"problemMatcher": [
{
"owner": "tidy-error-file-line",
"pattern": [
{
"regexp": "^tidy error: /checkout/(.+):(\\d+): (.+)$",
"file": 1,
"line": 2,
"message": 3
}
]
}
]
}
2 changes: 2 additions & 0 deletions src/ci/scripts/run-build-from-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
export CI="true"
export SRC=.

echo "::add-matcher::src/ci/github-actions/problem_matchers.json"

# Remove any preexisting rustup installation since it can interfere
# with the cargotest step and its auto-detection of things like Clippy in
# the environment
Expand Down

0 comments on commit 62c95fd

Please sign in to comment.