Skip to content

Commit 5bc54f9

Browse files
committed
Add "js" to tidy extra checks for "mingw-check-tidy" CI job
Also, stop pre-installing `eslint` - the docker image is not cached in CI, so there's no point in explicitly `npm install`ing it instead of just letting `npx` download it
1 parent 2bd8d2e commit 5bc54f9

File tree

1 file changed

+1
-6
lines changed
  • src/ci/docker/host-x86_64/mingw-check-tidy

1 file changed

+1
-6
lines changed

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

Lines changed: 1 addition & 6 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/mingw-check-tidy/eslint.version /tmp/
33-
3431
COPY scripts/sccache.sh /scripts/
3532
RUN sh /scripts/sccache.sh
3633

@@ -41,9 +38,7 @@ RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-require
4138
COPY host-x86_64/mingw-check-1/validate-toolstate.sh /scripts/
4239
COPY host-x86_64/mingw-check-1/validate-error-codes.sh /scripts/
4340

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

0 commit comments

Comments
 (0)