Skip to content

Commit 83dee35

Browse files
committed
Install yarn in tidy dockerfile
1 parent 3bdc467 commit 83dee35

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ 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/
31+
COPY host-x86_64/tidy/*.version /tmp/
3332

3433
COPY scripts/sccache.sh /scripts/
3534
RUN sh /scripts/sccache.sh
@@ -40,7 +39,9 @@ RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-require
4039

4140
COPY 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.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.22.22

0 commit comments

Comments
 (0)