Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add current git revision to POM file #43

Merged
merged 1 commit into from
Jun 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion cljest/build.edn
Original file line number Diff line number Diff line change
@@ -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"}
Expand Down
5 changes: 3 additions & 2 deletions cljest/dev/cljest/build.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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)})
Expand All @@ -106,6 +107,6 @@
:lib lib
:version version
:basis basis
:scm scm
:scm (assoc scm :tag git-rev)
:src-dirs ["src"]})))

2 changes: 1 addition & 1 deletion cljest/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions jest-preset-cljest/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion jest-preset-cljest/package.json
Original file line number Diff line number Diff line change
@@ -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": {},
Expand Down