Skip to content

Commit 35bad34

Browse files
alexander-yakushevbbatsov
authored andcommitted
[ci] Run Eastwood together with other linters
1 parent 514526d commit 35bad34

File tree

1 file changed

+4
-34
lines changed

1 file changed

+4
-34
lines changed

.circleci/config.yml

Lines changed: 4 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -98,41 +98,21 @@ jobs:
9898
clojure_version:
9999
type: string
100100
default: "1.12"
101-
executor: jdk21
101+
executor: jdk24
102102
environment:
103103
CLOJURE_VERSION: << parameters.clojure_version >>
104+
TEST_PROFILES: "-user,-dev,+test,+cljs"
104105
steps:
105106
- checkout
106107
- with_cache:
107-
cache_version: "lint_v1_<< parameters.clojure_version >>"
108+
cache_version: "lint_v2_<< parameters.clojure_version >>"
108109
steps:
109110
- run:
110111
name: Running cljfmt
111112
command: make cljfmt
112113
- run:
113114
name: Running clj-kondo
114115
command: make kondo
115-
116-
eastwood:
117-
description: |
118-
Run Eastwood on source code against given version of JDK and Clojure
119-
parameters:
120-
jdk_version:
121-
type: string
122-
clojure_version:
123-
type: string
124-
default: "1.12"
125-
executor: << parameters.jdk_version >>
126-
environment:
127-
CLOJURE_VERSION: << parameters.clojure_version >>
128-
TEST_PROFILES: "-user,-dev,+test,+cljs"
129-
steps:
130-
- checkout
131-
- with_cache:
132-
cache_version: "eastwood_v1_<< parameters.clojure_version >>"
133-
steps:
134-
# Eastwood is run for every Clojure and JDK version because its
135-
# results are sensitive to the code in the runtime.
136116
- run:
137117
name: Running Eastwood
138118
command: make eastwood
@@ -208,8 +188,7 @@ workflows:
208188
clojure_version: ["1.10", "1.11", "1.12"]
209189
<<: *run_always
210190
- test:
211-
# Sanity check that we don't have a requirement for Clojurescript or
212-
# spec-alpha2 being on the classpath.
191+
# Sanity check that we don't have a requirement for Clojurescript being on the classpath.
213192
matrix:
214193
alias: "test_no_extra_deps"
215194
parameters:
@@ -219,22 +198,13 @@ workflows:
219198
<<: *run_always
220199
- test_windows:
221200
<<: *run_always
222-
# Eastwood output partly depends on JDK version it is run on,
223-
# so selectively test with several versions of those.
224-
- eastwood:
225-
matrix:
226-
alias: "eastwood"
227-
parameters:
228-
jdk_version: [jdk8, jdk24]
229-
<<: *run_always
230201
- lint:
231202
<<: *run_always
232203
- deploy:
233204
requires:
234205
- test
235206
- test_no_extra_deps
236207
- test_windows
237-
- eastwood
238208
- lint
239209
filters:
240210
branches:

0 commit comments

Comments
 (0)