Skip to content

Commit 3a4a738

Browse files
authored
Rollup merge of #148880 - yotamofek:pr/dockerfile-eslint-install, r=Kobzol,GuillaumeGomez
Remove explicit install of `eslint` inside of `tidy`'s Dockerfile `tidy` will already install it (when needed) due to it being in `package.json` With this change, we don't have the version of `eslint` specific in two different places :) (this was added in #141705 , before `tidy` gained the ability to run `npm install`, and is not needed anymore)
2 parents 17c25e4 + c09185c commit 3a4a738

File tree

2 files changed

+0
-6
lines changed

2 files changed

+0
-6
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ COPY scripts/nodejs.sh /scripts/
2828
RUN sh /scripts/nodejs.sh /node
2929
ENV PATH="/node/bin:${PATH}"
3030

31-
# Install eslint
32-
COPY host-x86_64/tidy/eslint.version /tmp/
33-
3431
COPY scripts/sccache.sh /scripts/
3532
RUN sh /scripts/sccache.sh
3633

@@ -40,8 +37,6 @@ RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-require
4037

4138
COPY host-x86_64/pr-check-1/validate-toolstate.sh /scripts/
4239

43-
RUN bash -c 'npm install -g eslint@$(cat /tmp/eslint.version)'
44-
4540
# NOTE: intentionally uses python2 for x.py so we can test it still works.
4641
# validate-toolstate only runs in our CI, so it's ok for it to only support python3.
4742
ENV SCRIPT TIDY_PRINT_DIFF=1 python2.7 ../x.py test \

src/ci/docker/host-x86_64/tidy/eslint.version

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)