Merge pull request #43 from pitch-io/tag-pom

Add current git revision to POM file
pitch-io · Jun 17, 2023 · 0de19ae · 0de19ae
2 parents 3928888 + 18989a8
commit 0de19ae
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 7 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,14 @@
 # Changelog
 
+# 1.1.3
+
+This version and 1.1.2 have no user facing changes except that they make the `cljdoc` build work completely, as in `1.1.1` while the analysis worked, the docs didn't.
+
+## Internal
+
+- [Use `clojure` rather than `clj` and add update `scm.connection` value to use `scm:git:git...`.](https://github.com/pitch-io/cljest/pull/42)
+- [Add git revision to POM file.](https://github.com/pitch-io/cljest/pull/43)
+
 # 1.1.1
 
 ## Improvements

diff --git a/cljest/build.edn b/cljest/build.edn
@@ -1,5 +1,5 @@
 {:lib com.pitch/cljest
- :version "1.1.2"
+ :version "1.1.3"
  :scm {:url "https://github.com/pitch-io/cljest"
        :connection "scm:git:git://github.com/pitch-io/cljest.git"
        :developerConnection "scm:git:[email protected]:pitch-io/cljest.git"}

diff --git a/cljest/dev/cljest/build.clj b/cljest/dev/cljest/build.clj
@@ -83,7 +83,8 @@
                                                                        [k (assoc v :optional? true)]))
                                                                 (into {}))}})
         jar-dir "dist/build_files/jar"
-        pom-dir (str "dist/" (lib->group-id lib))]
+        pom-dir (str "dist/" (lib->group-id lib))
+        git-rev (tools.build.api/git-process {:git-args ["rev-parse" "HEAD"]})]
     (tools.build.api/copy-dir {:src-dirs src-dirs
                                :target-dir jar-dir
                                :ignores (map re-pattern ignore)})
@@ -106,6 +107,6 @@
                                 :lib lib
                                 :version version
                                 :basis basis
-                                :scm scm
+                                :scm (assoc scm :tag git-rev)
                                 :src-dirs ["src"]})))
 
diff --git a/cljest/package-lock.json b/cljest/package-lock.json
diff --git a/jest-preset-cljest/package-lock.json b/jest-preset-cljest/package-lock.json
diff --git a/jest-preset-cljest/package.json b/jest-preset-cljest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jest-preset-cljest",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "A preset for Jest to allow compiling ClojureScript tests",
   "main": "jest-preset.js",
   "scripts": {},