Skip to content

Fix default JDK version tests #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cap10morgan merged 2 commits into from
Apr 10, 2026
Merged

Fix default JDK version tests #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98b9687
Fix tests relying on default JDK version
cap10morgan Apr 9, 2026
c1a526b
Fix exit code of ‘bb run test’
cap10morgan Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions bb.edn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)}}
9 changes: 5 additions & 4 deletions test/docker_clojure/docker_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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"})]
Expand Down
Loading