Skip to content

Commit 5190fd3

Browse files
committed
Auto merge of rust-lang#134964 - Kobzol:tidy-full-check, r=onur-ozkan
Run Python formatting check in tidy on CI I don't think that there's a reason why we should ignore Python formatting on CI, when we already check Python lints and C++ formatting. r? `@onur-ozkan`
2 parents eeeff9a + 787c2a2 commit 5190fd3

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

Diff for: src/ci/docker/host-x86_64/mingw-check-tidy/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ COPY host-x86_64/mingw-check/validate-error-codes.sh /scripts/
3535
# NOTE: intentionally uses python2 for x.py so we can test it still works.
3636
# validate-toolstate only runs in our CI, so it's ok for it to only support python3.
3737
ENV SCRIPT TIDY_PRINT_DIFF=1 python2.7 ../x.py test \
38-
--stage 0 src/tools/tidy tidyselftest --extra-checks=py:lint,cpp:fmt
38+
--stage 0 src/tools/tidy tidyselftest --extra-checks=py,cpp

Diff for: src/ci/scripts/upload-build-metrics.py

+12-2
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,23 @@ def upload_datadog_measure(name: str, value: float):
5151
print(f"Metric {name}: {value:.4f}")
5252

5353
cmd = "npx"
54-
if os.getenv("GITHUB_ACTIONS") is not None and sys.platform.lower().startswith("win"):
54+
if os.getenv("GITHUB_ACTIONS") is not None and sys.platform.lower().startswith(
55+
"win"
56+
):
5557
# Due to weird interaction of MSYS2 and Python, we need to use an absolute path,
5658
# and also specify the ".cmd" at the end. See https://github.com/rust-lang/rust/pull/125771.
5759
cmd = "C:\\Program Files\\nodejs\\npx.cmd"
5860

5961
subprocess.run(
60-
[cmd, "datadog-ci", "measure", "--level", "job", "--measures", f"{name}:{value}"],
62+
[
63+
cmd,
64+
"datadog-ci",
65+
"measure",
66+
"--level",
67+
"job",
68+
"--measures",
69+
f"{name}:{value}",
70+
],
6171
check=False,
6272
)
6373

0 commit comments

Comments
 (0)