Skip to content

Commit 575d232

Browse files
authored
Unrolled build for #142434
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: #142433
2 parents 64c81fd + 9d642fe commit 575d232

File tree

1 file changed

+4
-2
lines changed
  • src/ci/docker/host-x86_64/mingw-check-tidy

1 file changed

+4
-2
lines changed

src/ci/docker/host-x86_64/mingw-check-tidy/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-require
4141
COPY host-x86_64/mingw-check-1/validate-toolstate.sh /scripts/
4242
COPY host-x86_64/mingw-check-1/validate-error-codes.sh /scripts/
4343

44+
RUN bash -c 'npm install -g eslint@$(cat /tmp/eslint.version)'
45+
4446
# NOTE: intentionally uses python2 for x.py so we can test it still works.
4547
# validate-toolstate only runs in our CI, so it's ok for it to only support python3.
46-
ENV SCRIPT TIDY_PRINT_DIFF=1 npm install eslint@$(head -n 1 /tmp/eslint.version) && \
47-
python2.7 ../x.py test --stage 0 src/tools/tidy tidyselftest --extra-checks=py,cpp
48+
ENV SCRIPT TIDY_PRINT_DIFF=1 python2.7 ../x.py test --stage 0 \
49+
src/tools/tidy tidyselftest --extra-checks=py,cpp

0 commit comments

Comments
 (0)