Fix CI smoke tests

WhimsicalCode · Jun 11, 2023 · c21f075 · c21f075
1 parent 8f142b4
commit c21f075
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 15 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,9 +16,28 @@ jobs:
       - name: Install clojure tools
         uses: DeLaGuardo/[email protected]
         with:
+          cli: latest
           lein: 2.9.10
           bb: latest
           clj-kondo: 2023.05.18
+          cljfmt: 0.10.4
+
+      - name: Execute tests
+        working-directory: ./cljfmt
+        run: lein test
+
+      - name: Execute babashka tests
+        run: bb test
+
+      - name: Check formatting
+        run: bb fmt
+
+      - name: Lint sourcecode
+        run: bb lint
+
+      - name: Install cljfmt dependency
+        working-directory: ./cljfmt
+        run: lein install
 
       - name: Install GraalVM
         uses: graalvm/setup-graalvm@v1
@@ -38,19 +57,6 @@ jobs:
         working-directory: ./cljfmt
         run: lein native-image
 
-      - name: Execute tests
-        working-directory: ./cljfmt
-        run: lein test
-
-      - name: Execute babashka tests
-        run: bb test
-
-      - name: Check formatting
-        run: cljfmt/target/cljfmt check
-
-      - name: Lint sourcecode
-        run: bb lint
-
       - name: Run smoke tests
         run: bb smoke
 

diff --git a/scripts/smoke_test.bb b/scripts/smoke_test.bb
@@ -7,8 +7,9 @@
                              "lein cljfmt check")))))
 
 (deftest check-clj-tool
-  (is (zero? (:exit (p/shell
-                     "clj -M -m cljfmt.main check cljfmt/src cljfmt/test")))))
+  (is (zero? (:exit
+              (p/shell
+               "clojure -M -m cljfmt.main check cljfmt/src cljfmt/test")))))
 
 (deftest check-standalone
   (is (zero? (:exit (p/shell