Skip to content

Commit 3da6dd6

Browse files
alexander-yakushevbbatsov
authored andcommitted
[ci] Update linters
1 parent 07154e3 commit 3da6dd6

File tree

3 files changed

+23
-34
lines changed

3 files changed

+23
-34
lines changed

.circleci/config.yml

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -93,17 +93,26 @@ jobs:
9393
lint:
9494
description: |
9595
Running linters
96-
parameters:
97-
steps:
98-
type: steps
99-
executor: jdk21
96+
executor: jdk24
10097
environment:
10198
CLOJURE_VERSION: "1.12"
10299
steps:
103100
- checkout
104101
- with_cache:
105-
cache_version: "lint_v3_1.12"
106-
steps: << parameters.steps >>
102+
cache_version: "lint_v4"
103+
steps:
104+
- run:
105+
name: Running cljfmt
106+
command: |
107+
make cljfmt
108+
- run:
109+
name: Running clj-kondo
110+
command: |
111+
make kondo
112+
- run:
113+
name: Running Eastwood
114+
command: |
115+
make eastwood
107116
108117
deploy:
109118
# JDK 8 is preferred for deployments (https://github.com/benedekfazekas/mranderson/issues/57)
@@ -173,20 +182,6 @@ workflows:
173182
jdk_version: [jdk8, jdk11, jdk17, jdk21, jdk24]
174183
<<: *run_always
175184
- lint:
176-
steps:
177-
- run:
178-
name: Running cljfmt
179-
command: |
180-
make cljfmt
181-
# TODO: use `make kondo` instead once there's a fix for https://github.com/clj-kondo/clj-kondo/issues/2189
182-
- run:
183-
name: Running clj-kondo
184-
command: |
185-
make light-kondo
186-
- run:
187-
name: Running Eastwood
188-
command: |
189-
make eastwood
190185
<<: *run_always
191186
- deploy:
192187
requires:

Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.PHONY: test quick-test eastwood cljfmt cljfmt-fix install fast-install smoketest deploy clean detect_timeout lint light-kondo docs test_impl
1+
.PHONY: test quick-test eastwood cljfmt cljfmt-fix install fast-install smoketest deploy clean detect_timeout lint docs test_impl
22
.DEFAULT_GOAL := quick-test
33

44
# Set bash instead of sh for the @if [[ conditions,
@@ -62,10 +62,6 @@ cljfmt-fix:
6262
kondo: .make_kondo_prep clean
6363
CIDER_NO_MRANDERSON="true" CIDER_NO_PEDANTIC="true" lein with-profile -user,-dev,+test,+clj-kondo,+deploy,+$(CLOJURE_VERSION) clj-kondo
6464

65-
# A variation that does not analyze the classpath, as it OOMs otherwise on CircleCI.
66-
light-kondo: clean
67-
CIDER_NO_MRANDERSON="true" CIDER_NO_PEDANTIC="true" lein with-profile -user,-dev,+test,+clj-kondo,+deploy,+$(CLOJURE_VERSION) clj-kondo
68-
6965
lint: kondo cljfmt eastwood
7066

7167
# PROJECT_VERSION=x.y.z make install

project.clj

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -137,18 +137,16 @@
137137
cider.nrepl/wrap-xref]}}]
138138

139139
:cljfmt [:test
140-
{:plugins [[lein-cljfmt "0.9.2"]]
141-
:cljfmt {:indents {as-> [[:inner 0]]
142-
delay [[:inner 0]]
143-
timing [[:inner 0]]
144-
with-debug-bindings [[:inner 0]]
145-
merge-meta [[:inner 0]]
146-
try-if-let [[:block 1]]}}}]
140+
{:plugins [[dev.weavejester/lein-cljfmt "0.13.1"]]
141+
:cljfmt {:extra-indents {timing [[:inner 0]]
142+
with-debug-bindings [[:inner 0]]
143+
merge-meta [[:inner 0]]
144+
try-if-let [[:block 1]]}}}]
147145

148-
:clj-kondo {:plugins [[com.github.clj-kondo/lein-clj-kondo "2023.09.07"]]}
146+
:clj-kondo {:plugins [[com.github.clj-kondo/lein-clj-kondo "2025.04.07"]]}
149147

150148
:eastwood [:test
151-
{:plugins [[jonase/eastwood "1.4.0"]]
149+
{:plugins [[jonase/eastwood "1.4.3"]]
152150
:eastwood {:config-files ["eastwood.clj"]
153151
:exclude-namespaces [cider.nrepl.middleware.test-filter-tests cider.tasks]}}]
154152

0 commit comments

Comments
 (0)