add formatter to CI + makefile

smartcontractkit · Aug 26, 2024 · 6b7bdd4 · 6b7bdd4
1 parent 02a8105
commit 6b7bdd4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -105,6 +105,13 @@ jobs:
       with:
         path: contracts/target
         key: ${{ runner.os }}-v2-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
+
+    - name: format (cargo, go, yarn)
+      run: |
+        yarn install --frozen-lockfile
+        cd ../ # back to root
+        make format-contracts
+        git diff --stat --exit-code
 
     - name: cargo check
       env:
@@ -117,6 +124,3 @@ jobs:
           cd /repo/contracts &&\
           cargo check &&\
           cargo clippy -- -D warnings"
-
-    # - run: cargo check
-    # - run: cargo clippy -- -D warnings
diff --git a/Makefile b/Makefile
@@ -127,3 +127,7 @@ upgrade-e2e-solana-image:
 .PHONY: update-e2e-core-deps
 upgrade-e2e-core-deps:
 	cd ./integration-tests && ../scripts/update-e2e.sh
+
+.PHONY: format-contracts
+format-contracts:
+	cd ./contracts && cargo fmt && go fmt ./... && yarn format