diff options
| author | bors <bors@rust-lang.org> | 2025-01-01 16:08:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-01-01 16:08:17 +0000 |
| commit | 372442fe5ff1a2d06f4119f2b2e7d1e42388a0d3 (patch) | |
| tree | 9e37ac47354a7a14543266cd33935ef4629a5231 | |
| parent | eeeff9a66cda13934600800eee40fd84ba1647eb (diff) | |
| parent | 787c2a2c6a6152cdd707ff0eaf8d1429dd874f32 (diff) | |
| download | rust-372442fe5ff1a2d06f4119f2b2e7d1e42388a0d3.tar.gz rust-372442fe5ff1a2d06f4119f2b2e7d1e42388a0d3.zip | |
Auto merge of #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`
| -rw-r--r-- | src/ci/docker/host-x86_64/mingw-check-tidy/Dockerfile | 2 | ||||
| -rw-r--r-- | src/ci/scripts/upload-build-metrics.py | 14 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/ci/docker/host-x86_64/mingw-check-tidy/Dockerfile b/src/ci/docker/host-x86_64/mingw-check-tidy/Dockerfile index cb17592b201..f52e306974c 100644 --- a/src/ci/docker/host-x86_64/mingw-check-tidy/Dockerfile +++ b/src/ci/docker/host-x86_64/mingw-check-tidy/Dockerfile @@ -35,4 +35,4 @@ COPY host-x86_64/mingw-check/validate-error-codes.sh /scripts/ # NOTE: intentionally uses python2 for x.py so we can test it still works. # validate-toolstate only runs in our CI, so it's ok for it to only support python3. ENV SCRIPT TIDY_PRINT_DIFF=1 python2.7 ../x.py test \ - --stage 0 src/tools/tidy tidyselftest --extra-checks=py:lint,cpp:fmt + --stage 0 src/tools/tidy tidyselftest --extra-checks=py,cpp diff --git a/src/ci/scripts/upload-build-metrics.py b/src/ci/scripts/upload-build-metrics.py index 49c068c9a40..915ba953984 100644 --- a/src/ci/scripts/upload-build-metrics.py +++ b/src/ci/scripts/upload-build-metrics.py @@ -51,13 +51,23 @@ def upload_datadog_measure(name: str, value: float): print(f"Metric {name}: {value:.4f}") cmd = "npx" - if os.getenv("GITHUB_ACTIONS") is not None and sys.platform.lower().startswith("win"): + if os.getenv("GITHUB_ACTIONS") is not None and sys.platform.lower().startswith( + "win" + ): # Due to weird interaction of MSYS2 and Python, we need to use an absolute path, # and also specify the ".cmd" at the end. See https://github.com/rust-lang/rust/pull/125771. cmd = "C:\\Program Files\\nodejs\\npx.cmd" subprocess.run( - [cmd, "datadog-ci", "measure", "--level", "job", "--measures", f"{name}:{value}"], + [ + cmd, + "datadog-ci", + "measure", + "--level", + "job", + "--measures", + f"{name}:{value}", + ], check=False, ) |