Skip to content

Commit

Permalink
Rollup merge of #85285 - GuillaumeGomez:eslint-check, r=jsha,Mark-Sim…
Browse files Browse the repository at this point in the history
…ulacrum

Add eslint checks to CI

It also allowed me to fix some potential issues that went unnoticed. Having this process automated will hopefully prevent us to add more errors. :)

cc `@Mark-Simulacrum` (for the add in the CI).
r? `@jsha`
  • Loading branch information
GuillaumeGomez authored May 30, 2021
2 parents 5957990 + 558b073 commit 9c873c1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/ci/docker/host-x86_64/mingw-check/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ ENV PATH="/node-v14.4.0-linux-x64/bin:${PATH}"
# Install es-check
# Pin its version to prevent unrelated CI failures due to future es-check versions.
RUN npm install [email protected] -g
RUN npm install [email protected] -g

COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh
Expand All @@ -37,4 +38,5 @@ ENV SCRIPT python3 ../x.py --stage 2 test src/tools/expand-yaml-anchors && \
python3 ../x.py doc --stage 0 library/test && \
/scripts/validate-toolstate.sh && \
# Runs checks to ensure that there are no ES5 issues in our JS code.
es-check es5 ../src/librustdoc/html/static/*.js
es-check es5 ../src/librustdoc/html/static/*.js && \
eslint ../src/librustdoc/html/static/*.js
1 change: 1 addition & 0 deletions src/librustdoc/html/static/sidebar-items.js
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/* global initSidebarItems */
initSidebarItems({});

0 comments on commit 9c873c1

Please sign in to comment.