Skip to content

Commit 58bb713

Browse files
committed
restore clojure 1.11 checks
1 parent e844b33 commit 58bb713

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

.github/workflows/clojure.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ jobs:
1212
strategy:
1313
matrix:
1414
# Supported Java versions: LTS releases and latest
15-
jdk: [8, 11, 17, 21, 23]
15+
jdk: [8, 11, 17, 21]
16+
clojure: [11, 12]
1617

17-
name: Java ${{ matrix.jdk }}
18+
name: Clojure ${{ matrix.clojure }} (Java ${{ matrix.jdk }})
1819

1920
runs-on: ubuntu-latest
2021

@@ -30,16 +31,16 @@ jobs:
3031
path: |
3132
~/.m2/repository
3233
~/.gitlibs
33-
key: ${{ runner.os }}-test-deps-${{ hashFiles('**/deps.edn') }}-${{ matrix.jdk }}
34+
key: ${{ runner.os }}-test-deps-${{ hashFiles('**/deps.edn') }}-${{ matrix.clojure }}-${{ matrix.jdk }}
3435
restore-keys: |
35-
${{ runner.os }}-test-deps-${{ hashFiles('**/deps.edn') }}-
36+
${{ runner.os }}-test-deps-${{ hashFiles('**/deps.edn') }}-${{ matrix.clojure }}-
3637
${{ runner.os }}-test-deps-
3738
- name: Setup Clojure
3839
uses: DeLaGuardo/setup-clojure@master
3940
with:
4041
cli: latest
4142
- name: Run tests
42-
run: bin/kaocha
43+
run: CLOJURE_ALIAS=clojure-${{ matrix.clojure }} bin/kaocha
4344

4445
build-cljs:
4546
name: ClojureScript

bin/kaocha

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
#!/usr/bin/env bash
2-
clojure -M:test -m kaocha.runner "$@"
2+
# Should work if the env var is empty
3+
clojure -M:test:$CLOJURE_ALIAS -m kaocha.runner "$@"

deps.edn

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
com.bhauman/spell-spec {:mvn/version "0.1.2"}
2727
org.clojure/spec-alpha2 {:git/url "https://github.com/clojure/spec-alpha2.git"
2828
:sha "4cbfa677c4cd66339f18e1c122222c05c69e0d8e"}}}
29+
:clojure-11 {:extra-deps {org.clojure/clojure {:mvn/version "1.11.3"}}}
30+
:clojure-12 {}
2931
:sci {:extra-deps {org.babashka/sci {:mvn/version "0.9.44"}}}
3032
:cherry {:extra-deps {io.github.squint-cljs/cherry {:git/sha "bccd994556efca378984c5ac7fd973bda164923b"}}}
3133
:test-sci {:extra-paths ["test-sci"]

0 commit comments

Comments
 (0)