From 1c042c375b879ac06b72d1c762ca4371d72ac8f3 Mon Sep 17 00:00:00 2001 From: lread Date: Mon, 30 Aug 2021 21:50:13 -0400 Subject: [PATCH] PR review feedback: change run-doc-tests arg to :aliases Example usages are now: ``` clojure -T:build run-doc-tests clojure -T:build run-doc-tests :aliases '[:cljs]' clojure -T:build run-doc-tests :aliases '[:1.9]' clojure -T:build run-doc-tests :aliases '[:1.10]' clojure -T:build run-doc-tests :aliases '[:master]' ``` --- build.clj | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/build.clj b/build.clj index f59599b..97f9f39 100644 --- a/build.clj +++ b/build.clj @@ -4,6 +4,8 @@ clojure -T:build run-tests clojure -T:build run-tests :aliases '[:master]' + clojure -T:build run-doc-tests :aliases '[:cljs]' + clojure -T:build ci For more information, run: @@ -25,26 +27,28 @@ (defn run-doc-tests "Generate and run doc tests. - Optionally specify :plaftorm: - :1.9 -- test against Clojure 1.9 (the default) - :1.10 -- test against Clojure 1.10.3 - :master -- test against Clojure 1.11 master snapshot - :cljs -- test against ClojureScript" - [{:keys [platform] :or {platform :1.9} :as opts}] + Optionally specify :aliases vector: + [:1.9] -- test against Clojure 1.9 (the default) + [:1.10] -- test against Clojure 1.10.3 + [:master] -- test against Clojure 1.11 master snapshot + [:cljs] -- test against ClojureScript" + [{:keys [aliases] :as opts}] (gen-doc-tests opts) (bb/run-tests (assoc opts :aliases - (conj [:test-doc platform] - (if (= :cljs platform) - :test-doc-cljs - :test-doc-clj))))) + (-> [:test-doc] + (into aliases) + (into (if (some #{:cljs} aliases) + [:test-doc-cljs] + [:test-doc-clj]))))) + opts) (defn ci "Run the CI pipeline of tests (and build the JAR)." [opts] (-> opts (bb/clean) (assoc :lib lib :version version) (as-> opts - (reduce (fn [opts platform] - (run-doc-tests (assoc opts :platform platform))) + (reduce (fn [opts alias] + (run-doc-tests (assoc opts :aliases [alias]))) opts [:cljs :1.9 :1.10 :master])) (eastwood)