From c09185c8ac15628602b2f0d81a8bc0ce32bd544f Mon Sep 17 00:00:00 2001 From: Yotam Ofek Date: Wed, 12 Nov 2025 21:39:58 +0200 Subject: [PATCH] Remove explicit install of `eslint` inside of `tidy`'s Dockerfile `tidy` will already install it (when needed) due to it being in `package.json` --- src/ci/docker/host-x86_64/tidy/Dockerfile | 5 ----- src/ci/docker/host-x86_64/tidy/eslint.version | 1 - 2 files changed, 6 deletions(-) delete mode 100644 src/ci/docker/host-x86_64/tidy/eslint.version diff --git a/src/ci/docker/host-x86_64/tidy/Dockerfile b/src/ci/docker/host-x86_64/tidy/Dockerfile index 2dda51b155e90..133192e8ac214 100644 --- a/src/ci/docker/host-x86_64/tidy/Dockerfile +++ b/src/ci/docker/host-x86_64/tidy/Dockerfile @@ -28,9 +28,6 @@ COPY scripts/nodejs.sh /scripts/ RUN sh /scripts/nodejs.sh /node ENV PATH="/node/bin:${PATH}" -# Install eslint -COPY host-x86_64/tidy/eslint.version /tmp/ - COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh @@ -40,8 +37,6 @@ RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-require COPY host-x86_64/pr-check-1/validate-toolstate.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 python2.7 ../x.py test \ diff --git a/src/ci/docker/host-x86_64/tidy/eslint.version b/src/ci/docker/host-x86_64/tidy/eslint.version deleted file mode 100644 index 42890ac0095ac..0000000000000 --- a/src/ci/docker/host-x86_64/tidy/eslint.version +++ /dev/null @@ -1 +0,0 @@ -8.57.1