Skip to content

Commit

Permalink
Merge branch 'structural-navigation'
Browse files Browse the repository at this point in the history
  • Loading branch information
vlaaad committed Nov 5, 2020
2 parents c10b744 + 614f4cb commit 6936c45
Show file tree
Hide file tree
Showing 7 changed files with 446 additions and 248 deletions.
4 changes: 2 additions & 2 deletions build/version.clj
Expand Up @@ -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)))))
8 changes: 6 additions & 2 deletions dev/user.clj
Expand Up @@ -52,5 +52,9 @@
:local-date-time (LocalDateTime/ofEpochSecond 0 0 ZoneOffset/UTC)}})

(comment
(->> (range 10000)
(map #(hash-map :index % :string (str %)))))
(->> (range 100000)
(map #(hash-map :index % :string (str %))))

(repeat 1000 {:boolean true
:integer 100
:string "woop"}))
4 changes: 2 additions & 2 deletions release.ps1
Expand Up @@ -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"


0 comments on commit 6936c45

Please sign in to comment.