File tree Expand file tree Collapse file tree 2 files changed +5
-3
lines changed
src/ci/docker/host-x86_64/tidy Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -28,8 +28,7 @@ COPY scripts/nodejs.sh /scripts/
2828RUN sh /scripts/nodejs.sh /node
2929ENV PATH="/node/bin:${PATH}"
3030
31- # Install eslint
32- COPY host-x86_64/tidy/eslint.version /tmp/
31+ COPY host-x86_64/tidy/*.version /tmp/
3332
3433COPY scripts/sccache.sh /scripts/
3534RUN sh /scripts/sccache.sh
@@ -40,7 +39,9 @@ RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-require
4039
4140COPY host-x86_64/pr-check-1/validate-toolstate.sh /scripts/
4241
43- RUN bash -c 'npm install -g eslint@$(cat /tmp/eslint.version)'
42+ # Install yarn, and then use it to install eslint
43+ RUN bash -c 'npm install -g yarn@$(cat /tmp/yarn.version)'
44+ RUN bash -c 'yarn global add eslint@$(cat /tmp/eslint.version)'
4445
4546# NOTE: intentionally uses python2 for x.py so we can test it still works.
4647# validate-toolstate only runs in our CI, so it's ok for it to only support python3.
Original file line number Diff line number Diff line change 1+ 1.22.22
You can’t perform that action at this time.
0 commit comments