Skip to content

Commit f3fe912

Browse files
committed
Switch to es6 for eslint
Also update Node to v16.9.0, es-check to 6.1.1, and eslint to 8.6.0.
1 parent 181e915 commit f3fe912

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1717
pkg-config \
1818
mingw-w64
1919

20-
RUN curl -sL https://nodejs.org/dist/v14.4.0/node-v14.4.0-linux-x64.tar.xz | tar -xJ
21-
ENV PATH="/node-v14.4.0-linux-x64/bin:${PATH}"
20+
RUN curl -sL https://nodejs.org/dist/v16.9.0/node-v16.9.0-linux-x64.tar.xz | tar -xJ
21+
ENV PATH="/node-v16.9.0-linux-x64/bin:${PATH}"
2222
# Install es-check
2323
# Pin its version to prevent unrelated CI failures due to future es-check versions.
24-
RUN npm install es-check@5.2.3 -g
25-
RUN npm install eslint@7.20.0 -g
24+
RUN npm install es-check@6.1.1 -g
25+
RUN npm install eslint@8.6.0 -g
2626

2727
COPY scripts/sccache.sh /scripts/
2828
RUN sh /scripts/sccache.sh
@@ -40,5 +40,5 @@ ENV SCRIPT python3 ../x.py --stage 2 test src/tools/expand-yaml-anchors && \
4040
/scripts/validate-toolstate.sh && \
4141
/scripts/validate-error-codes.sh && \
4242
# Runs checks to ensure that there are no ES5 issues in our JS code.
43-
es-check es5 ../src/librustdoc/html/static/js/*.js && \
43+
es-check es6 ../src/librustdoc/html/static/js/*.js && \
4444
eslint ../src/librustdoc/html/static/js/*.js

0 commit comments

Comments
 (0)