Skip to content

Commit 861271d

Browse files
authored
test & ci: bump deps, tweak pubcheck (#132)
* test & ci: bump deps, tweak pubcheck Of note: - clojure 1.12 beta2! - bb `pubcheck` task can now run checks on unpushed branch * ci test: bump graalvm * ci nvd scan: bump deps
1 parent 4564fab commit 861271d

File tree

5 files changed

+12
-10
lines changed

5 files changed

+12
-10
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
- { name: 'graalvm', short-name: 'graal' }
7575
- { name: 'graalvm-community', short-name: 'graalce' }
7676
java-version:
77-
- '22.0.1'
77+
- '22.0.2'
7878
clojure-version: [ '1.11', '1.12' ]
7979

8080
name: ${{matrix.os.name}} ${{matrix.distribution.short-name}} jdk${{matrix.java-version}} clj${{ matrix.clojure-version }}

bb.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{:paths ["script" "build"]
22
:deps {lread/status-line {:git/url "https://github.com/lread/status-line.git"
33
:sha "cf44c15f30ea3867227fa61ceb823e5e942c707f"}
4-
io.github.babashka/neil {:git/tag "v0.3.65" :git/sha "9a79582"}
4+
io.github.babashka/neil {:git/tag "v0.3.67" :git/sha "054ca51"}
55
version-clj/version-clj {:mvn/version "2.0.2"}}
66
:tasks {;; setup
77
:requires ([babashka.fs :as fs]

deps.edn

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
:1.9 {:override-deps {org.clojure/clojure {:mvn/version "1.9.0"}}}
1414
:1.10 {:override-deps {org.clojure/clojure {:mvn/version "1.10.3"}}}
1515
:1.11 {:override-deps {org.clojure/clojure {:mvn/version "1.11.3"}}}
16-
:1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.0-beta1"}}}
16+
:1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.0-beta2"}}}
1717
:test {:extra-paths ["test"]
1818
:extra-deps {io.github.cognitect-labs/test-runner
1919
{:git/tag "v0.5.1" :git/sha "dfb30dd"}}
@@ -24,15 +24,15 @@
2424
:extra-deps {com.github.clj-easy/graal-build-time {:mvn/version "1.0.5"}}}
2525
:build
2626
{:extra-paths ["build"]
27-
:deps {io.github.clojure/tools.build {:mvn/version "0.10.4"}
27+
:deps {io.github.clojure/tools.build {:mvn/version "0.10.5"}
2828
slipset/deps-deploy {:mvn/version "0.2.2"}
2929
babashka/fs {:mvn/version "0.5.21"}}
3030
:ns-default build}
3131
;; for consistent linting we use a specific version of clj-kondo through the jvm
3232
:clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2024.05.24"}}
3333
:override-deps {org.clojure/clojure {:mvn/version "1.11.3"}}
3434
:main-opts ["-m" "clj-kondo.main"]}
35-
:eastwood {:extra-deps {jonase/eastwood {:mvn/version "1.4.2"}}
35+
:eastwood {:extra-deps {jonase/eastwood {:mvn/version "1.4.3"}}
3636
:main-opts ["-m" "eastwood.lint" {:source-paths ["src/clojure"]
3737
:test-paths ["test"]
3838
:add-linters [:performance]}]}}}

nvd_check_helper_project/deps.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
#_:clj-kondo/ignore
55
{:mvn/version "RELEASE"}
66
;; temporarily try bumping transitive dep to current release
7-
org.owasp/dependency-check-core {:mvn/version "10.0.2"}}}
7+
org.owasp/dependency-check-core {:mvn/version "10.0.3"}}}

script/publish.clj

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,15 @@
5252
:out
5353
string/trim
5454
seq))
55+
(defn- local-branch? []
56+
(let [{:keys [exit]} (t/shell {:continue true :out :string :err :out}
57+
"git rev-parse --symbolic-full-name @{u}")]
58+
(not (zero? exit))))
5559

5660
(defn- unpushed-commits? []
5761
(let [{:keys [exit :out]} (t/shell {:continue true :out :string}
5862
"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?"))))
63+
(and (zero? exit) (-> out string/trim seq))))
6264

6365
(defn- analyze-changelog
6466
"Certainly not fool proof, but should help for common mistakes"
@@ -87,7 +89,7 @@
8789
{:check "no uncommitted code"
8890
:result (if (uncommitted-code?) :fail :pass)}
8991
{:check "no unpushed commits"
90-
:result (if (unpushed-commits?) :fail :pass)}
92+
:result (if (or (local-branch?) (unpushed-commits?)) :fail :pass)}
9193
{:check "changelog has unreleased section"
9294
:result (if (:section-missing changelog-findings) :fail :pass)}
9395
{:check "changelog unreleased section attributes valid"

0 commit comments

Comments
 (0)