Check cargo fmt in CI

jayvdb · Mar 23, 2024 · 582230c · 582230c
1 parent 0402a39
commit 582230c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -63,12 +63,17 @@ jobs:
         echo "C:\ProgramData\chocolatey\lib\SQLite\tools" >> $GITHUB_PATH
         echo "SQLITE3_LIB_DIR=C:\ProgramData\chocolatey\lib\SQLite\tools" >> $GITHUB_ENV
 
+    - name: Add Rust nightly toolchain
+      uses: actions-rust-lang/setup-rust-toolchain@v1
+      with:
+        toolchain: nightly
+        components: rustfmt
     - name: Install Rust tools
       run: cargo install typos-cli
     - name: Build
       run: make build
     - name: Lint
-      run: make lint
+      run: make lint-ci
     - name: Test Core
       run: cd butane_core && cargo test --all-features
     - name: Test Codegen

diff --git a/Makefile b/Makefile
@@ -14,8 +14,9 @@ build :
 lint :
 	$(CARGO) clippy --all-features -- -D warnings
 
+lint-ci : doclint lint spellcheck check-fmt
 
-check : build test doclint lint spellcheck
+check : build test doclint lint spellcheck check-fmt
 
 
 test :
@@ -25,6 +26,12 @@ clean :
 	$(CARGO) clean
 
 
+fmt :
+	cd butane && $(CARGO_NIGHTLY) fmt
+
+check-fmt :
+	cd butane && $(CARGO_NIGHTLY) fmt --check
+
 spellcheck :
 	typos