check formatting

.github/workflows/ci.yml

@@ -14,17 +14,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Check dashboard frontend formatting
-      uses: creyD/prettier_action@v4.2
-      with:
-        dry: true
-        prettier_options: --check amqp_dashboard/assets/* --ignore-path .gitignore
     - name: Build
       run: cargo build --verbose
     - name: Run clippy -D clippy::all
       run: cargo clippy --verbose -- -D clippy::all
     - name: Check format
-      run: cargo +nightly fmt --verbose --all -- --check
+      run: cargo xtask check-fmt
     - name: Run tests
       run: cargo test --verbose --all
     - name: Run client integration tests

amqp_dashboard/frontend/package.json

@@ -6,7 +6,9 @@
     "start": "react-scripts start",
     "build": "react-scripts build",
     "test": "react-scripts test",
-    "eject": "react-scripts eject"
+    "eject": "react-scripts eject",
+    "fmt": "prettier -w .",
+    "check-fmt": "prettier -c ."
   },
   "dependencies": {
     "@testing-library/jest-dom": "^5.14.1",

test-js/package.json

@@ -6,7 +6,8 @@
   "license": "MIT",
   "scripts": {
     "fmt": "prettier -w .",
-    "test": "prettier -c . && node test-all.js"
+    "check-fmt": "prettier -c .",
+    "test": "node test-all.js"
   },
   "dependencies": {
     "@types/amqplib": "^0.8.2",

xtask/src/check_fmt.rs

@@ -0,0 +1,35 @@
+use crate::project_root;
+use anyhow::ensure;
+use std::process::Command;
+
+pub fn main() -> anyhow::Result<()> {
+    println!("$ cargo +nightly fmt --check");
+    let status = Command::new("cargo")
+        .arg("+nightly")
+        .arg("fmt")
+        .arg("--check")
+        .current_dir(project_root())
+        .status()?;
+    ensure!(
+        status.success(),
+        "`cargo +nightly fmt --check` did not exit successfully"
+    );
+
+    println!("$ yarn");
+    let status = Command::new("yarn")
+        .arg("check-fmt")
+        .current_dir(project_root().join("test-js"))
+        .status()?;
+    ensure!(status.success(), "`yarn fmt` did not exist successfully");
+
+    println!("$ yarn");
+    let status = Command::new("yarn")
+        .arg("check-fmt")
+        .current_dir(project_root().join("amqp_dashboard/frontend"))
+        .status()?;
+    ensure!(status.success(), "`yarn fmt` did not exist successfully");
+
+    ensure!(status.success(), "`prettier .` did not exist successfully");
+
+    Ok(())
+}

xtask/src/fmt.rs

@@ -3,8 +3,9 @@ use anyhow::ensure;
 use std::process::Command;
 
 pub fn main() -> anyhow::Result<()> {
-    println!("$ cargo fmt");
+    println!("$ cargo +nightly fmt");
     let status = Command::new("cargo")
+        .arg("+nightly")
         .arg("fmt")
         .current_dir(project_root())
         .status()?;
@@ -17,13 +18,12 @@ pub fn main() -> anyhow::Result<()> {
         .status()?;
     ensure!(status.success(), "`yarn fmt` did not exist successfully");
 
-    println!("$ prettier -w .");
+    println!("$ yarn fmt");
-    let status = Command::new("prettier")
+    let status = Command::new("yarn")
-        .arg("-w")
+        .arg("fmt")
-        .arg(".")
+        .current_dir(project_root().join("amqp_dashboard/frontend"))
-        .current_dir(project_root().join("amqp_dashboard/assets"))
         .status()?;
-    ensure!(status.success(), "`prettier .` did not exist successfully");
+    ensure!(status.success(), "`yarn fmt` did not exist successfully");
 
     Ok(())
 }

xtask/src/main.rs

@@ -1,5 +1,6 @@
 use std::path::PathBuf;
 
+mod check_fmt;
 mod codegen;
 mod fmt;
 mod test_js;
@@ -21,6 +22,8 @@ enum Commands {
     TestJs,
     /// Format all code
     Fmt,
+    /// Check the formatting
+    CheckFmt,
 }
 
 fn main() -> anyhow::Result<()> {
@@ -30,6 +33,7 @@ fn main() -> anyhow::Result<()> {
         Commands::Generate => codegen::main(),
         Commands::TestJs => test_js::main(),
         Commands::Fmt => fmt::main(),
+        Commands::CheckFmt => check_fmt::main(),
     }
 }