From 98b96879d17b3c2ae6471d549d8989942466e30a Mon Sep 17 00:00:00 2001 From: Wes Morgan Date: Thu, 9 Apr 2026 15:50:48 -0600 Subject: [PATCH 1/2] Fix tests relying on default JDK version --- test/docker_clojure/docker_test.clj | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/docker_clojure/docker_test.clj b/test/docker_clojure/docker_test.clj index 6202c935..79787a28 100644 --- a/test/docker_clojure/docker_test.clj +++ b/test/docker_clojure/docker_test.clj @@ -35,11 +35,12 @@ (deftest all-tags-test (testing "Generates all-defaults tag for a build tool" (let [tags (all-tags {:base-image "debian" - :jdk-version 21 + :jdk-version cfg/default-jdk-version :distro :debian/bookworm :build-tool "tools-deps" :build-tool-version "1.11.1.1155"})] - (is ((set tags) "tools-deps")))) + (is ((set tags) "tools-deps") + (str "Expected \"tools-deps\" to be in " (pr-str tags))))) (testing "Generates jdk-version-build-tool tag for every jdk version" (are [jdk-version tag] (let [tags (all-tags {:base-image (if (< jdk-version 21) @@ -55,10 +56,10 @@ 11 "temurin-11-tools-deps" 17 "temurin-17-tools-deps" 21 "temurin-21-tools-deps")) - (testing "Generates build-tool-distro tag for every distro" + (testing "Generates build-tool-distro tag for every distro with default JDK version" (are [distro tag] (let [tags (all-tags {:base-image "debian" - :jdk-version 21 + :jdk-version cfg/default-jdk-version :distro distro :build-tool "tools-deps" :build-tool-version "1.11.1.1155"})] From c1a526b1eb9cb02d0fad861394bd6b4130280816 Mon Sep 17 00:00:00 2001 From: Wes Morgan Date: Thu, 9 Apr 2026 15:57:49 -0600 Subject: [PATCH 2/2] =?UTF-8?q?Fix=20exit=20code=20of=20=E2=80=98bb=20run?= =?UTF-8?q?=20test=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tests were failing in CI but not causing the run to fail due to this --- bb.edn | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bb.edn b/bb.edn index 466b9f54..bd92e6c0 100644 --- a/bb.edn +++ b/bb.edn @@ -3,11 +3,10 @@ org.babashka/spec.alpha {:git/url "https://github.com/babashka/spec.alpha" :git/sha "b6eb0f2208ab036c0a5d0e7235cb0b09d2feabb7"}} :tasks - {:requires ([babashka.deps :as deps] - [docker-clojure.core :as dc]) + {:requires ([docker-clojure.core :as dc]) clean (dc/-main "clean") dockerfiles {:depends [clean] :task (apply dc/-main "dockerfiles" *command-line-args*)} manifest (apply dc/-main "manifest" *command-line-args*) build-images {:task (apply dc/-main "build-images" *command-line-args*)} - test (deref (deps/clojure '-X:test))}} + test (clojure '-X:test)}}