wip

evmar · Sep 15, 2024 · 8b707d5 · 8b707d5
1 parent d82b684
commit 8b707d5
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/.github/workflows/fmt.yml b/.github/workflows/fmt.yml
@@ -4,8 +4,9 @@ jobs:
   fmt:
     runs-on: ubuntu-latest
     steps:
-      - name: check out
-        uses: actions/checkout@v4
-      # TODO: use misc/fmt.sh
-      - run: cargo fmt -- --check || echo 'run `cargo fmt` to format your code'
-        name: check formatting
+      - uses: actions/checkout@v4
+      - run: |
+          if [ ! -f $HOME/.dprint ]; then
+            curl -fsSL https://dprint.dev/install.sh | sh
+          fi
+      - run: ./misc/fmt.sh --check
diff --git a/HACKING.md b/HACKING.md
@@ -19,7 +19,7 @@ $ sudo apt install libsdl2-dev
 
 ## CLI build
 
-Build/run the CLI app:
+Build/run the CLI  app:
 
 ```
 $ cargo build -p retrowin32 -F x86-emu,sdl --profile=lto

diff --git a/misc/fmt.sh b/misc/fmt.sh
@@ -2,7 +2,18 @@
 
 # Run all code formatters.
 
-set -e
+set -Ee
 
-cargo fmt
-web/node_modules/.bin/dprint fmt
+if [ "$1" = "--check" ]; then
+    if ! (
+        cargo fmt -- --check &&
+        web/node_modules/.bin/dprint check
+    ); then
+        echo
+        echo "error: formatting check failed; run 'misc/fmt.sh' to fix"
+        exit 1
+    fi
+else
+    cargo fmt
+    web/node_modules/.bin/dprint fmt
+fi