Skip to content

Commit 01fb301

Browse files
committed
update dependencies; add simpler cljs testing
Signed-off-by: Sean Corfield <[email protected]>
1 parent 8d04d6d commit 01fb301

File tree

4 files changed

+31
-14
lines changed

4 files changed

+31
-14
lines changed

.github/workflows/cljs_test.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ jobs:
66
name: ClojureScript Test
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v2
9+
- uses: actions/checkout@v4
1010

1111
- uses: actions/setup-java@v4
1212
with:
1313
distribution: 'temurin'
1414
java-version: '17'
1515

16-
- uses: DeLaGuardo/setup-clojure@3.1
16+
- uses: DeLaGuardo/setup-clojure@12.5
1717
with:
18-
tools-deps: '1.10.1.763'
18+
tools-deps: '1.12.0.1479'
1919

2020
- name: Cache maven
21-
uses: actions/cache@v2
21+
uses: actions/cache@v4
2222
env:
2323
cache-name: cache-maven
2424
with:
@@ -28,7 +28,7 @@ jobs:
2828
${{ runner.os }}-${{ env.cache-name }}-
2929
3030
- name: Cache gitlibs
31-
uses: actions/cache@v2
31+
uses: actions/cache@v4
3232
env:
3333
cache-name: cache-gitlibs
3434
with:
@@ -43,4 +43,4 @@ jobs:
4343
- name: Run tests
4444
run: |
4545
node target/test.js | tee test-out.txt
46-
grep -qxF '0 failures, 0 errors.' test-out.txt
46+
grep -qxF '0 failures, 0 errors.' test-out.txt

.gitignore

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1-
target
1+
.calva/repl.calva-repl
2+
.clj-kondo/.cache/
3+
.cpcache/
24
.lein*
5+
.lsp/.cache/
6+
.nrepl-port
7+
.portal/vs-code.edn
8+
cljs-test-runner-out/
39
lib
410
multi-lib
5-
.cpcache/
6-
target
11+
target

deps.edn

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,30 @@
11
{:paths ["src/main/clojure"]
22
:aliases {:test
33
{:extra-paths ["src/test/clojure"]
4-
:extra-deps {org.clojure/test.check {:mvn/version "1.0.0"}}}
5-
:1.6 {:override-deps {org.clojure/clojure {:mvn/version "1.6.0"}}}
4+
:extra-deps {org.clojure/test.check {:mvn/version "1.1.1"}}}
65
:1.7 {:override-deps {org.clojure/clojure {:mvn/version "1.7.0"}}}
76
:1.8 {:override-deps {org.clojure/clojure {:mvn/version "1.8.0"}}}
87
:1.9 {:override-deps {org.clojure/clojure {:mvn/version "1.9.0"}}}
98
:1.10 {:override-deps {org.clojure/clojure {:mvn/version "1.10.3"}}}
109
:1.11 {:override-deps {org.clojure/clojure {:mvn/version "1.11.4"}}}
1110
:1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.0"}}}
12-
:runner
11+
;; purely to support Clojure 1.7 testing:
12+
:runner-1.7
1313
{:extra-deps {com.cognitect/test-runner
1414
{:git/url "https://github.com/cognitect-labs/test-runner"
1515
:sha "f7ef16dc3b8332b0d77bc0274578ad5270fbfedd"}}
1616
:main-opts ["-m" "cognitect.test-runner"
1717
"-d" "src/test/clojure"]}
18+
;; suitable for Clojure 1.8 or later:
19+
:runner
20+
{:extra-deps {io.github.cognitect-labs/test-runner
21+
{:git/tag "v0.5.1" :git/sha "dfb30dd"}}
22+
:main-opts ["-m" "cognitect.test-runner"
23+
"-d" "src/test/clojure"]}
24+
:cljs-runner
25+
{:extra-deps {olical/cljs-test-runner {:mvn/version "3.8.1"}}
26+
:main-opts ["-m" "cljs-test-runner.main"
27+
"-d" "src/test/clojure"]}
1828
:cljs
1929
{:extra-deps {org.clojure/clojurescript {:mvn/version "1.11.132"}}
2030
:main-opts ["-m" "cljs.main" "-re" "node" "-r"]}

run-tests.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#!/bin/sh
22

3-
versions="1.7 1.8 1.9 1.10 1.11 1.12"
3+
time clojure -M:test:runner-1.7:1.7
4+
versions="1.8 1.9 1.10 1.11 1.12"
45
for v in $versions
56
do
6-
time clj -M:test:runner:$v
7+
time clojure -M:test:runner:$v
78
done
9+
time clojure -M:test:cljs-runner

0 commit comments

Comments
 (0)