Improve versioning in build script

vlaaad · Nov 5, 2020 · 614f4cb · 614f4cb
1 parent 5cc5d9d
commit 614f4cb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/build/version.clj b/build/version.clj
@@ -26,11 +26,11 @@
             (recur tags parent (zip/right child)))
           (zip/append-child parent replace-node))))))
 
-(defn -main [& version]
+(defn -main [version hash]
   (with-open [reader (io/reader "pom.xml")]
     (let [xml (-> reader
                   (xml/parse :skip-whitespace true)
                   (xml-update [::pom/version] (xml/sexp-as-element [::pom/version version]))
-                  (xml-update [::pom/scm ::pom/tag] (xml/sexp-as-element [::pom/tag version])))]
+                  (xml-update [::pom/scm ::pom/tag] (xml/sexp-as-element [::pom/tag hash])))]
       (with-open [writer (io/writer "pom.xml")]
         (xml/indent xml writer)))))
diff --git a/release.ps1 b/release.ps1
@@ -9,14 +9,14 @@ if (!((invoke git rev-parse --abbrev-ref HEAD) -eq "master")) {
 }
 $version = "1.0.$(invoke git rev-list HEAD --count)"
 
-clj -A:build -m version $version
+clj -A:build -M -m version $version $(invoke git rev-parse HEAD)
 clj -Spom
 invoke git commit -am "Release $version"
 invoke git tag $version
 invoke git push
 invoke git push origin $version
 clj -A:depstar "$version.jar"
-clj -A:build -m deploy "$version.jar" (Read-Host -Prompt "Username") (Read-Host -Prompt "Token" -AsSecureString | ConvertFrom-SecureString -AsPlainText)
+clj -A:build -M -m deploy "$version.jar" (Read-Host -Prompt "Username") (Read-Host -Prompt "Token" -AsSecureString | ConvertFrom-SecureString -AsPlainText)
 rm "$version.jar"