diff options
| author | Jubilee <workingjubilee@gmail.com> | 2025-06-13 20:59:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-13 20:59:18 -0700 |
| commit | fa359f66a17d46a5fa10782c5d9a385a1f60c4f2 (patch) | |
| tree | 6ddd95c7191f99fad079a8f76679e5e2848cd38f | |
| parent | 179bcf6805a88cab439f9bb5ad4e57aeb1b21cfa (diff) | |
| parent | 9d642fe6f37078c26d6bd081c3b4eaf9adef9559 (diff) | |
| download | rust-fa359f66a17d46a5fa10782c5d9a385a1f60c4f2.tar.gz rust-fa359f66a17d46a5fa10782c5d9a385a1f60c4f2.zip | |
Rollup merge of #142434 - Kobzol:preinstall-eslint, r=marcoieni
Pre-install JS dependencies in tidy Dockerfile Also fixes passing `TIDY_PRINT_DIFF` to tidy, which has been passed to `npm install` rather than to tidy after the latest change here. r? `@GuillaumeGomez` Fixes: https://github.com/rust-lang/rust/issues/142433
| -rw-r--r-- | src/ci/docker/host-x86_64/mingw-check-tidy/Dockerfile | 6 |
1 files changed, 4 insertions, 2 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 006a697af21..8d2c5e004e4 100644 --- a/src/ci/docker/host-x86_64/mingw-check-tidy/Dockerfile +++ b/src/ci/docker/host-x86_64/mingw-check-tidy/Dockerfile @@ -41,7 +41,9 @@ RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-require COPY host-x86_64/mingw-check-1/validate-toolstate.sh /scripts/ COPY host-x86_64/mingw-check-1/validate-error-codes.sh /scripts/ +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 npm install eslint@$(head -n 1 /tmp/eslint.version) && \ - python2.7 ../x.py test --stage 0 src/tools/tidy tidyselftest --extra-checks=py,cpp +ENV SCRIPT TIDY_PRINT_DIFF=1 python2.7 ../x.py test --stage 0 \ + src/tools/tidy tidyselftest --extra-checks=py,cpp |