Skip to content

Commit a7bbba3

Browse files
authored
test & ci: bump deps, tweak pubcheck (#79)
Of note: - clojure 1.12 beta2! - bb `pubcheck` task can now run checks on unpushed branch
1 parent ee3febf commit a7bbba3

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

Diff for: bb.edn

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
:task publish/-main}
4646
neil ;; let's not rely on a random version of neil
4747
{:doc "Pinned version of babashka/neil (used in scripting)"
48-
:extra-deps {io.github.babashka/neil {:git/tag "v0.3.65" :git/sha "9a79582"}}
48+
:extra-deps {io.github.babashka/neil {:git/tag "v0.3.67" :git/sha "054ca51"}}
4949
:task babashka.neil/-main}
5050
;; hidden tasks, no need for folks to be trying these ci invoked tasks
5151
-ci-clojars-deploy

Diff for: deps.edn

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
:1.9 {:override-deps {org.clojure/clojure {:mvn/version "1.9.0"}}}
1010
:1.10 {:override-deps {org.clojure/clojure {:mvn/version "1.10.3"}}}
1111
:1.11 {:override-deps {org.clojure/clojure {:mvn/version "1.11.3"}}}
12-
:1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.0-beta1"}}}
12+
:1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.0-beta2"}}}
1313
:build
1414
{:extra-paths ["build"]
15-
:deps {io.github.clojure/tools.build {:mvn/version "0.10.4"}
15+
:deps {io.github.clojure/tools.build {:mvn/version "0.10.5"}
1616
slipset/deps-deploy {:mvn/version "0.2.2"}}
1717
:ns-default build}
1818
:http-server ;; used for to support integration tests
@@ -35,7 +35,7 @@
3535
:clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2024.05.24"}}
3636
:override-deps {org.clojure/clojure {:mvn/version "1.11.3"}}
3737
:main-opts ["-m" "clj-kondo.main"]}
38-
:outdated {:extra-deps {com.github.liquidz/antq {:mvn/version "2.8.1201"}
38+
:outdated {:extra-deps {com.github.liquidz/antq {:mvn/version "2.8.1206"}
3939
org.clojure/clojure {:mvn/version "1.11.3"}
4040
org.slf4j/slf4j-simple {:mvn/version "2.0.13"} ;; to rid ourselves of logger warnings
4141
}

Diff for: script/publish.clj

+7-4
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,15 @@
5353
string/trim
5454
seq))
5555

56+
(defn- local-branch? []
57+
(let [{:keys [exit]} (t/shell {:continue true :out :string :err :out}
58+
"git rev-parse --symbolic-full-name @{u}")]
59+
(not (zero? exit))))
60+
5661
(defn- unpushed-commits? []
5762
(let [{:keys [exit :out]} (t/shell {:continue true :out :string}
5863
"git cherry -v")]
59-
(if (zero? exit)
60-
(-> out string/trim seq)
61-
(status/die 1 "Failed to check for unpushed commits, are you on an unpushed branch?"))))
64+
(and (zero? exit) (-> out string/trim seq))))
6265

6366
(defn- analyze-changelog
6467
"Certainly not fool proof, but should help for common mistakes"
@@ -87,7 +90,7 @@
8790
{:check "no uncommitted code"
8891
:result (if (uncommitted-code?) :fail :pass)}
8992
{:check "no unpushed commits"
90-
:result (if (unpushed-commits?) :fail :pass)}
93+
:result (if (or (local-branch?) (unpushed-commits?)) :fail :pass)}
9194
{:check "changelog has unreleased section"
9295
:result (if (:section-missing changelog-findings) :fail :pass)}
9396
{:check "changelog unreleased section attributes valid"

0 commit comments

Comments
 (0)