fixup! fixup! fixup! split concerns

exoscale · Jul 18, 2024 · 0b71800 · 0b71800
1 parent 300ca78
commit 0b71800
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 29 deletions.
diff --git a/.clj-kondo/config.edn b/.clj-kondo/config.edn
@@ -1,5 +1,25 @@
 {:linters
- {:clojure-lsp/unused-public-var {:exclude [exoscale.tools.project/add-module
+ {:clojure-lsp/unused-public-var {:exclude [exoscale.tools.project.api.java/compile
+ exoscale.tools.project.api/version
+ exoscale.tools.project.module/clean
+ exoscale.tools.project.module/compile
+ exoscale.tools.project.module/deploy
+ exoscale.tools.project.module/install
+ exoscale.tools.project.module/jar
+ exoscale.tools.project.module/release
+ exoscale.tools.project.module/release-git-count-revs
+ exoscale.tools.project.module/task
+ exoscale.tools.project.module/uberjar
+ exoscale.tools.project.standalone/git-commit-version
+ exoscale.tools.project.standalone/git-push
+ exoscale.tools.project.standalone/git-tag-version
+ exoscale.tools.project.standalone/release
+ exoscale.tools.project.standalone/version-bump-and-snapshot
+ exoscale.tools.project.standalone/version-remove-snapshot
+ exoscale.tools.project.template/data-fn
+ exoscale.tools.project.template/module-data-fn
+ exoscale.tools.project.template/template-fn
+ exoscale.tools.project/add-module
  exoscale.tools.project/check
  exoscale.tools.project/clean
  exoscale.tools.project/deploy
@@ -25,25 +45,7 @@
  exoscale.tools.project/uberjar
  exoscale.tools.project/version
  exoscale.tools.project/version-bump-and-snapshot
- exoscale.tools.project/version-remove-snapshot
- exoscale.tools.project.api/version
- exoscale.tools.project.api.java/compile
- exoscale.tools.project.module/clean
- exoscale.tools.project.module/compile
- exoscale.tools.project.module/deploy
- exoscale.tools.project.module/install
- exoscale.tools.project.module/jar
- exoscale.tools.project.module/release
- exoscale.tools.project.module/task
- exoscale.tools.project.module/uberjar
- exoscale.tools.project.standalone/git-commit-version
- exoscale.tools.project.standalone/git-push
- exoscale.tools.project.standalone/git-tag-version
- exoscale.tools.project.standalone/release
- exoscale.tools.project.standalone/version-bump-and-snapshot
- exoscale.tools.project.standalone/version-remove-snapshot
- exoscale.tools.project.template/data-fn
- exoscale.tools.project.template/module-data-fn
- exoscale.tools.project.template/template-fn]}}
+ exoscale.tools.project/version-git-count-revs
+ exoscale.tools.project/version-remove-snapshot]}}
  :skip-comments true
  :output {:exclude-files ["^resources/exoscale"]}}
diff --git a/src/exoscale/tools/project.clj b/src/exoscale/tools/project.clj
@@ -87,6 +87,10 @@
  [opts]
  (task-or-tool opts :release/modules ps/release))
 
+(defn release-git-count-revs
+ [opts]
+ (task-or-tool opts :release/git-count-revs ps/release))
+
 (defn revision-sha
  [opts]
  (task-or-tool opts :revision-sha ps/revision-sha))

diff --git a/src/exoscale/tools/project/api/tasks.clj b/src/exoscale/tools/project/api/tasks.clj
@@ -82,13 +82,13 @@
  :revision-sha [{:run :exoscale.tools.project.standalone/revision-sha
  :for-all [:exoscale.project/modules]}]
 
- :release/single  [{:run :exoscale.tools.project.standalone/version-remove-snapshot}
-  {:run :exoscale.tools.project.standalone/deploy}
-  {:run :exoscale.tools.project.standalone/git-commit-version}
-  {:run :exoscale.tools.project.standalone/git-tag-version}
-  {:run :exoscale.tools.project.standalone/version-bump-and-snapshot}
-  {:run :exoscale.tools.project.standalone/git-commit-version}
-  {:run :exoscale.tools.project.standalone/git-push}]
+ :release/single [{:run :exoscale.tools.project.standalone/version-remove-snapshot}
+ {:run :exoscale.tools.project.standalone/deploy}
+ {:run :exoscale.tools.project.standalone/git-commit-version}
+ {:run :exoscale.tools.project.standalone/git-tag-version}
+ {:run :exoscale.tools.project.standalone/version-bump-and-snapshot}
+ {:run :exoscale.tools.project.standalone/git-commit-version}
+ {:run :exoscale.tools.project.standalone/git-push}]
 
  :release/modules [{:run :exoscale.tools.project.standalone/version-remove-snapshot}
  {:ref :deploy}
@@ -98,6 +98,12 @@
  {:run :exoscale.tools.project.standalone/git-commit-version}
  {:run :exoscale.tools.project.standalone/git-push}]
 
+ :release/git-count-revs
+ [{:run :exoscale.tools.project.standalone/version-git-count-revs}
+ {:run :exoscale.tools.project.standalone/deploy}
+ {:run :exoscale.tools.project.standalone/git-tag-version}
+ {:run :exoscale.tools.project.standalone/git-push}]
+
  :prep-self [{:run :exoscale.tools.project.standalone/prep-self
  :for-all [:exoscale.project/modules]
  :when :deps/prep-lib}]})

diff --git a/src/exoscale/tools/project/standalone.clj b/src/exoscale/tools/project/standalone.clj
@@ -138,14 +138,21 @@
  (assoc :id :release/single)
  (tasks/task opts)))
 
+(defn release-git-count-revs
+ [opts]
+ (-> opts
+ into-opts
+ (assoc :id :release/git-count-revs)
+ (tasks/task opts)))
+
 (def ^{:arglists '([opts])} version-bump-and-snapshot
  (comp v/bump-and-snapshot into-opts))
 
 (def ^{:arglists '([opts])} version-remove-snapshot
  (comp v/remove-snapshot into-opts))
 
 (def ^{:arglists '([opts])} version-git-count-revs
- (comp v/git-count-revs into-opts))
+ (comp v/update-as-git-count-revs into-opts))
 
 (def ^{:arglists '([opts])} git-commit-version
  (comp git/commit-version into-opts))