Skip to content

Commit 389f8cc

Browse files
committed
Adopt our "new" matrix-based CI config
Also add Java17 and Clojure 1.11. Java 19 is already out of date, so I'm not copying that over from kaocha-cucumber, which I used as a source. Also, it's not super new, really.
1 parent e5f5697 commit 389f8cc

File tree

1 file changed

+17
-30
lines changed

1 file changed

+17
-30
lines changed

.circleci/config.yml

+17-30
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].2
4+
kaocha: lambdaisland/[email protected].3
5+
clojure: lambdaisland/[email protected].8
66

77
commands:
88
checkout_and_run:
@@ -20,36 +20,23 @@ commands:
2020
- kaocha/upload_codecov
2121

2222
jobs:
23-
java-15-clojure-1_10:
24-
executor: clojure/openjdk15
25-
steps: [{checkout_and_run: {clojure_version: "1.10.1"}}]
26-
27-
java-15-clojure-1_9:
28-
executor: clojure/openjdk15
29-
steps: [{checkout_and_run: {clojure_version: "1.9.0"}}]
30-
31-
java-11-clojure-1_10:
32-
executor: clojure/openjdk11
33-
steps: [{checkout_and_run: {clojure_version: "1.10.1"}}]
34-
35-
java-11-clojure-1_9:
36-
executor: clojure/openjdk11
37-
steps: [{checkout_and_run: {clojure_version: "1.9.0"}}]
38-
39-
java-8-clojure-1_10:
40-
executor: clojure/openjdk8
41-
steps: [{checkout_and_run: {clojure_version: "1.10.1"}}]
23+
test:
24+
parameters:
25+
os:
26+
type: executor
27+
clojure_version:
28+
type: string
29+
executor: << parameters.os >>
30+
steps:
31+
- checkout_and_run:
32+
clojure_version: << parameters.clojure_version >>
4233

43-
java-8-clojure-1_9:
44-
executor: clojure/openjdk8
45-
steps: [{checkout_and_run: {clojure_version: "1.9.0"}}]
4634

4735
workflows:
4836
kaocha_test:
4937
jobs:
50-
- java-15-clojure-1_10
51-
- java-15-clojure-1_9
52-
- java-11-clojure-1_10
53-
- java-11-clojure-1_9
54-
- java-8-clojure-1_10
55-
- java-8-clojure-1_9
38+
- test:
39+
matrix:
40+
parameters:
41+
os: [clojure/openjdk17, clojure/openjdk16, clojure/openjdk11, clojure/openjdk8]
42+
clojure_version: ["1.9.0", "1.10.3", "1.11.1"]

0 commit comments

Comments
 (0)