Skip to content

Commit 614df43

Browse files
committed
Add extra cautions around mranderson
1 parent 94cd87a commit 614df43

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

Makefile

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ dump-version:
2020
echo '"$(PROJECT_VERSION)"' > resources/cider/nrepl/version.edn
2121

2222
.inline-deps: project.clj clean
23+
rm -f .no-mranderson
2324
lein with-profile -user,-dev inline-deps
2425
touch $@
2526

26-
inline-deps: .inline-deps
27-
2827
test: clean .inline-deps test/resources/cider/nrepl/clojuredocs/export.edn
28+
rm -f .no-mranderson
2929
lein with-profile -user,-dev,+$(CLOJURE_VERSION),+test,+plugin.mranderson/config test
3030

3131
quick-test: clean
@@ -46,28 +46,29 @@ cljfmt:
4646
touch .no-pedantic
4747
touch .no-mranderson
4848
lein with-profile -user,-dev,+test,+clj-kondo,+deploy,+$(CLOJURE_VERSION) clj-kondo --copy-configs --dependencies --lint '$$classpath' > $@
49-
rm .no-pedantic
50-
rm .no-mranderson
49+
rm -f .no-pedantic
50+
rm -f .no-mranderson
5151

5252
kondo: .make_kondo_prep clean
5353
touch .no-pedantic
5454
touch .no-mranderson
5555
lein with-profile -user,-dev,+test,+clj-kondo,+deploy,+$(CLOJURE_VERSION) clj-kondo
56-
rm .no-pedantic
57-
rm .no-mranderson
56+
rm -f .no-pedantic
57+
rm -f .no-mranderson
5858

5959
# A variation that does not analyze the classpath, as it OOMs otherwise on CircleCI.
6060
light-kondo: clean
6161
touch .no-pedantic
6262
touch .no-mranderson
6363
lein with-profile -user,-dev,+test,+clj-kondo,+deploy,+$(CLOJURE_VERSION) clj-kondo
64-
rm .no-pedantic
65-
rm .no-mranderson
64+
rm -f .no-pedantic
65+
rm -f .no-mranderson
6666

6767
lint: kondo cljfmt eastwood
6868

6969
# PROJECT_VERSION=0.37.1 make install
7070
install: dump-version check-install-env .inline-deps
71+
rm -f .no-mranderson
7172
touch .no-pedantic
7273
lein with-profile -user,-dev,+$(CLOJURE_VERSION),+plugin.mranderson/config install
7374
touch .no-pedantic
@@ -95,6 +96,7 @@ detect_timeout:
9596
# Deployment is performed via CI by creating a git tag prefixed with "v".
9697
# Please do not deploy locally as it skips various measures (particularly around mranderson).
9798
deploy: check-env .inline-deps
99+
rm -f .no-mranderson
98100
lein with-profile -user,+$(CLOJURE_VERSION),+plugin.mranderson/config deploy clojars
99101

100102
check-env:

project.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
false)
3030

3131
;; mranderson cannot be put in a profile (as the other plugins),
32-
;; we conditionally disable it, because otherwise clj-kondo cannot run.
32+
;; so we conditionally disable it, because otherwise clj-kondo cannot run.
3333
:plugins ~(if (-> ".no-mranderson" java.io.File. .exists)
3434
[]
3535
'[[thomasa/mranderson "0.5.4-SNAPSHOT"]])

0 commit comments

Comments
 (0)