Skip to content

Commit 3e1987c

Browse files
committed
Release flow only cleans on prep
In my experimentation with bb tasks I had moved clean to task only code and accidentally applied to every release step.
1 parent 8c72cc9 commit 3e1987c

3 files changed

Lines changed: 34 additions & 20 deletions

File tree

bb.edn

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,7 @@
4646
:task lint/-main}
4747

4848
clean {:doc "delete generated/cached build work"
49-
:task (when (no-args-check)
50-
(doseq [dir ["target" ".cpcache"]]
51-
(println "Deleting" dir)
52-
(when (fs/exists? dir)
53-
(fs/delete-tree dir))))}
49+
:task clean/-main }
5450

5551
test-unit {:doc "test-doc-block units tests under Clojure 1.10"
5652
:task (when-let [clojure-version (requested-clojure-version)]
@@ -120,7 +116,4 @@
120116

121117
ci-release {:doc "release task, use --help for args"
122118
:requires [ci-release]
123-
:task (do
124-
(binding [*command-line-args* []]
125-
(run 'clean))
126-
(apply ci-release/-main *command-line-args*))}}}
119+
:task ci-release/-main}}}

script/ci_release.clj

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
;;
66

77
(ns ci-release
8-
(:require [clojure.edn :as edn]
8+
(:require [clean]
9+
[clojure.edn :as edn]
910
[clojure.java.io :as io]
1011
[clojure.string :as string]
1112
[helper.main :as main]
@@ -184,16 +185,17 @@ Options
184185
(let [target-version-filename "target/target-version.txt"]
185186
(cond
186187
(get opts "prep")
187-
(let [changelog-status (validate-changelog)
188-
target-version (calculate-version)
189-
last-version (last-release-tag)]
190-
(status/line :detail "Last version released: %s" (or last-version "<none>"))
191-
(status/line :detail "Target version: %s" target-version)
192-
(io/make-parents target-version-filename)
193-
(spit target-version-filename target-version)
194-
(update-user-guide! target-version)
195-
(update-changelog! target-version last-version changelog-status)
196-
(create-jar! target-version))
188+
(do (clean/clean!)
189+
(let [changelog-status (validate-changelog)
190+
target-version (calculate-version)
191+
last-version (last-release-tag)]
192+
(status/line :detail "Last version released: %s" (or last-version "<none>"))
193+
(status/line :detail "Target version: %s" target-version)
194+
(io/make-parents target-version-filename)
195+
(spit target-version-filename target-version)
196+
(update-user-guide! target-version)
197+
(update-changelog! target-version last-version changelog-status)
198+
(create-jar! target-version)))
197199

198200
(get opts "deploy-remote")
199201
(deploy-jar!)

script/clean.clj

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/usr/bin/env bb
2+
3+
(ns clean
4+
(:require [babashka.fs :as fs]
5+
[helper.main :as main]))
6+
7+
(defn clean! []
8+
(doseq [dir ["target" ".cpcache"]]
9+
(println "Deleting" dir)
10+
(when (fs/exists? dir)
11+
(fs/delete-tree dir))))
12+
13+
(defn -main [& args]
14+
(when (main/doc-arg-opt args)
15+
(clean!))
16+
nil)
17+
18+
(main/when-invoked-as-script
19+
(apply -main *command-line-args*))

0 commit comments

Comments
 (0)