Centralize the eslint version between tidy and docker

Author: GuillaumeGomez

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

@@ -29,7 +29,8 @@ RUN sh /scripts/nodejs.sh /node
 ENV PATH="/node/bin:${PATH}"
 
 # Install eslint
-RUN npm install [email protected]
+COPY host-x86_64/mingw-check-tidy/eslint.version /tmp/
+RUN npm install eslint@$(head -n 1 /tmp/eslint.version)
 
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh

src/ci/docker/host-x86_64/mingw-check-tidy/eslint.version

@@ -0,0 +1 @@
+8.6.0

src/tools/tidy/src/main.rs

@@ -109,7 +109,7 @@ fn main() {
         check!(rustdoc_gui_tests, &tests_path);
         check!(rustdoc_css_themes, &librustdoc_path);
         check!(rustdoc_templates, &librustdoc_path);
-        check!(rustdoc_js, &librustdoc_path, &tools_path);
+        check!(rustdoc_js, &librustdoc_path, &tools_path, &src_path);
         check!(known_bug, &crashes_path);
         check!(unknown_revision, &tests_path);
 

src/tools/tidy/src/rustdoc_js.rs

@@ -51,27 +51,35 @@ fn get_eslint_version() -> Option<String> {
     get_eslint_version_inner(false).or_else(|| get_eslint_version_inner(true))
 }
 
-const ESLINT_VERSION: &str = "8.6.0";
-
-pub fn check(librustdoc_path: &Path, tools_path: &Path, bad: &mut bool) {
+pub fn check(librustdoc_path: &Path, tools_path: &Path, src_path: &Path, bad: &mut bool) {
+    let eslint_version_path =
+        src_path.join("ci/docker/host-x86_64/mingw-check-tidy/eslint.version");
+    let eslint_version = match std::fs::read_to_string(&eslint_version_path) {
+        Ok(version) => version.trim().to_string(),
+        Err(error) => {
+            *bad = true;
+            eprintln!("failed to read `{}`: {error:?}", eslint_version_path.display());
+            return;
+        }
+    };
     match get_eslint_version() {
         Some(version) => {
-            if version != ESLINT_VERSION {
+            if version != eslint_version {
                 *bad = true;
                 eprintln!(
                     "⚠️ Installed version of eslint (`{version}`) is different than the \
-                     one used in the CI (`{ESLINT_VERSION}`)",
+                     one used in the CI (`{eslint_version}`)",
                 );
                 eprintln!(
                     "You can install this version using `npm update eslint` or by using \
-                     `npm install eslint@{ESLINT_VERSION}`",
+                     `npm install eslint@{eslint_version}`",
                 );
                 return;
             }
         }
         None => {
             eprintln!("`eslint` doesn't seem to be installed. Skipping tidy check for JS files.");
-            eprintln!("You can install it using `npm install eslint@{ESLINT_VERSION}`");
+            eprintln!("You can install it using `npm install eslint@{eslint_version}`");
             return;
         }
     }