Skip to content

Commit 89183ce

Browse files
authored
Merge pull request #32 from lambdaisland/alys/update-ci-to-java'19
Convert to test matrix
2 parents be57a5d + f85c8a0 commit 89183ce

File tree

2 files changed

+19
-23
lines changed

2 files changed

+19
-23
lines changed

.circleci/config.yml

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
version: 2.1
22

33
orbs:
4-
kaocha: lambdaisland/[email protected].1
5-
clojure: lambdaisland/[email protected].4
4+
kaocha: lambdaisland/[email protected].3
5+
clojure: lambdaisland/[email protected].8
66

77
commands:
88
checkout_and_run:
@@ -26,26 +26,22 @@ commands:
2626
flags: clj
2727

2828
jobs:
29-
java-16-clojure-1_10:
30-
executor: clojure/openjdk16
31-
steps: [{checkout_and_run: {clojure_version: "1.10.1"}}]
32-
33-
java-15-clojure-1_10:
34-
executor: clojure/openjdk15
35-
steps: [{checkout_and_run: {clojure_version: "1.10.1"}}]
36-
37-
java-11-clojure-1_10:
38-
executor: clojure/openjdk11
39-
steps: [{checkout_and_run: {clojure_version: "1.10.1"}}]
40-
41-
java-8-clojure-1_10:
42-
executor: clojure/openjdk8
43-
steps: [{checkout_and_run: {clojure_version: "1.10.1"}}]
29+
test:
30+
parameters:
31+
os:
32+
type: executor
33+
clojure_version:
34+
type: string
35+
executor: << parameters.os >>
36+
steps:
37+
- checkout_and_run:
38+
clojure_version: << parameters.clojure_version >>
4439

4540
workflows:
4641
kaocha_test:
4742
jobs:
48-
- java-16-clojure-1_10
49-
- java-15-clojure-1_10
50-
- java-11-clojure-1_10
51-
- java-8-clojure-1_10
43+
- test:
44+
matrix:
45+
parameters:
46+
os: [clojure/openjdk19, clojure/openjdk17, clojure/openjdk15, clojure/openjdk11, clojure/openjdk8]
47+
clojure_version: ["1.10.3", "1.11.1"]

deps.edn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
:test
2020
{:extra-paths ["test"]
21-
:extra-deps {lambdaisland/kaocha {:mvn/version "RELEASE"}
22-
com.lambdaisland/kaocha-cljs {:mvn/version "1.2.123"}
21+
:extra-deps {lambdaisland/kaocha {:mvn/version "1.70.1086"}
22+
com.lambdaisland/kaocha-cljs {:mvn/version "1.4.130"}
2323
org.clojure/clojurescript {:mvn/version "1.11.60"}
2424
org.clojure/test.check {:mvn/version "1.1.1"}}}}}

0 commit comments

Comments
 (0)