diff options
| author | Ralf Jung <post@ralfj.de> | 2025-08-20 08:14:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-20 08:14:57 +0000 |
| commit | 46765526e33dca91b3860715097aa43efe2cf5da (patch) | |
| tree | c790c7a6d94c4d2c96b820cc93804ec55af4bdbe /src/ci | |
| parent | 49abb66e5d199497830b88397f2218cbe4b978f1 (diff) | |
| parent | 5556212823c359619302748e9280258c11799db1 (diff) | |
| download | rust-46765526e33dca91b3860715097aa43efe2cf5da.tar.gz rust-46765526e33dca91b3860715097aa43efe2cf5da.zip | |
Merge pull request #4532 from rust-lang/rustup-2025-08-20
Automatic Rustup
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/docker/host-x86_64/tidy/Dockerfile | 2 | ||||
| -rw-r--r-- | src/ci/docker/host-x86_64/tidy/eslint.version | 2 | ||||
| -rw-r--r-- | src/ci/scripts/free-disk-space-windows-wait.py | 21 |
3 files changed, 20 insertions, 5 deletions
diff --git a/src/ci/docker/host-x86_64/tidy/Dockerfile b/src/ci/docker/host-x86_64/tidy/Dockerfile index ee1ae5410ee..c8558689d3b 100644 --- a/src/ci/docker/host-x86_64/tidy/Dockerfile +++ b/src/ci/docker/host-x86_64/tidy/Dockerfile @@ -45,4 +45,4 @@ RUN bash -c 'npm install -g eslint@$(cat /tmp/eslint.version)' # 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,cpp,js + src/tools/tidy tidyselftest --extra-checks=py,cpp,js,spellcheck diff --git a/src/ci/docker/host-x86_64/tidy/eslint.version b/src/ci/docker/host-x86_64/tidy/eslint.version index 1acea15afd6..42890ac0095 100644 --- a/src/ci/docker/host-x86_64/tidy/eslint.version +++ b/src/ci/docker/host-x86_64/tidy/eslint.version @@ -1 +1 @@ -8.6.0 \ No newline at end of file +8.57.1 diff --git a/src/ci/scripts/free-disk-space-windows-wait.py b/src/ci/scripts/free-disk-space-windows-wait.py index b8612bb71c2..d510781d534 100644 --- a/src/ci/scripts/free-disk-space-windows-wait.py +++ b/src/ci/scripts/free-disk-space-windows-wait.py @@ -61,12 +61,27 @@ def read_pid_from_file() -> int: ) from e -def main() -> int: - pid = read_pid_from_file() +def wait_for_process(pid: int): + timeout_duration_seconds = 5 * 60 + interval_seconds = 3 + max_attempts = timeout_duration_seconds / interval_seconds + attempts = 0 # Poll until process exits while is_process_running(pid): - time.sleep(3) + if attempts >= max_attempts: + print( + "::warning::Timeout expired while waiting for the disk cleanup process to finish." + ) + break + time.sleep(interval_seconds) + attempts += 1 + + +def main() -> int: + pid = read_pid_from_file() + + wait_for_process(pid) print_logs() |