update dependencies; add simpler cljs testing

Signed-off-by: Sean Corfield <[email protected]>
clojure · Nov 1, 2024 · 01fb301 · 01fb301
1 parent 8d04d6d
commit 01fb301
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 14 deletions.
diff --git a/.github/workflows/cljs_test.yml b/.github/workflows/cljs_test.yml
@@ -6,19 +6,19 @@ jobs:
     name: ClojureScript Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'
 
-      - uses: DeLaGuardo/setup-clojure@3.1
+      - uses: DeLaGuardo/setup-clojure@12.5
         with:
-          tools-deps: '1.10.1.763'
+          tools-deps: '1.12.0.1479'
 
       - name: Cache maven
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         env:
           cache-name: cache-maven
         with:
@@ -28,7 +28,7 @@ jobs:
             ${{ runner.os }}-${{ env.cache-name }}-
 
       - name: Cache gitlibs
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         env:
           cache-name: cache-gitlibs
         with:
@@ -43,4 +43,4 @@ jobs:
       - name: Run tests
         run: |
           node target/test.js | tee test-out.txt
-          grep -qxF '0 failures, 0 errors.' test-out.txt
+          grep -qxF '0 failures, 0 errors.' test-out.txt
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,11 @@
-target
+.calva/repl.calva-repl
+.clj-kondo/.cache/
+.cpcache/
 .lein*
+.lsp/.cache/
+.nrepl-port
+.portal/vs-code.edn
+cljs-test-runner-out/
 lib
 multi-lib
-.cpcache/
-target
+target
diff --git a/deps.edn b/deps.edn
@@ -1,20 +1,30 @@
 {:paths ["src/main/clojure"]
  :aliases {:test
            {:extra-paths ["src/test/clojure"]
-            :extra-deps {org.clojure/test.check {:mvn/version "1.0.0"}}}
-           :1.6 {:override-deps {org.clojure/clojure {:mvn/version "1.6.0"}}}
+            :extra-deps {org.clojure/test.check {:mvn/version "1.1.1"}}}
            :1.7 {:override-deps {org.clojure/clojure {:mvn/version "1.7.0"}}}
            :1.8 {:override-deps {org.clojure/clojure {:mvn/version "1.8.0"}}}
            :1.9 {:override-deps {org.clojure/clojure {:mvn/version "1.9.0"}}}
            :1.10 {:override-deps {org.clojure/clojure {:mvn/version "1.10.3"}}}
            :1.11 {:override-deps {org.clojure/clojure {:mvn/version "1.11.4"}}}
            :1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.0"}}}
-           :runner
+           ;; purely to support Clojure 1.7 testing:
+           :runner-1.7
            {:extra-deps {com.cognitect/test-runner
                          {:git/url "https://github.com/cognitect-labs/test-runner"
                           :sha "f7ef16dc3b8332b0d77bc0274578ad5270fbfedd"}}
             :main-opts ["-m" "cognitect.test-runner"
                         "-d" "src/test/clojure"]}
+           ;; suitable for Clojure 1.8 or later:
+           :runner
+           {:extra-deps {io.github.cognitect-labs/test-runner
+                         {:git/tag "v0.5.1" :git/sha "dfb30dd"}}
+            :main-opts ["-m" "cognitect.test-runner"
+                        "-d" "src/test/clojure"]}
+           :cljs-runner
+           {:extra-deps {olical/cljs-test-runner {:mvn/version "3.8.1"}}
+            :main-opts ["-m" "cljs-test-runner.main"
+                        "-d" "src/test/clojure"]}
            :cljs
            {:extra-deps {org.clojure/clojurescript {:mvn/version "1.11.132"}}
             :main-opts ["-m" "cljs.main" "-re" "node" "-r"]}

diff --git a/run-tests.sh b/run-tests.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
 
-versions="1.7 1.8 1.9 1.10 1.11 1.12"
+time clojure -M:test:runner-1.7:1.7
+versions="1.8 1.9 1.10 1.11 1.12"
 for v in $versions
 do
-  time clj -M:test:runner:$v
+  time clojure -M:test:runner:$v
 done
+time clojure -M:test:cljs-runner