Add JDK 22 to build matrix

Author: alexander-yakushev

src/docker_clojure/config.clj

@@ -28,9 +28,6 @@
   (s/nilable (s/and ::non-blank-string #(re-matches #"[\d\.]+" %))))
 (s/def ::build-tools (s/map-of ::build-tool ::build-tool-version))
 
-(s/def ::exclusions
-  (s/keys :opt-un [::jdk-version ::distro ::build-tool ::build-tool-version]))
-
 (s/def ::maintainers
   (s/coll-of ::non-blank-string :distinct true :into #{}))
 
@@ -39,7 +36,7 @@
 
 (def git-repo "https://github.com/Quantisan/docker-clojure.git")
 
-(def jdk-versions #{8 11 17 21})
+(def jdk-versions #{8 11 17 21 22})
 
 (def base-images
   "Map of JDK version to base image name(s) with :default as a fallback"
@@ -95,14 +92,13 @@
     ; issue like this.
 
     ; no more focal builds for JDK 20+
-    ; TODO: Add ability to specify version >= 20 for these
-    {:jdk-version 21
+    {:jdk-version #(>= % 20)
      :distro      :ubuntu/focal}
+    ; boot is breaking on Alpine
     {:build-tool "boot"
-     :distro     :alpine/alpine} ; boot is breaking on Alpine
+     :distro     :alpine/alpine}
     ; we're no longer building boot variants for JDK 20+
-    ; TODO: Add ability to specify version >= 20 for these
-    {:jdk-version 21
+    {:jdk-version #(>= % 20)
      :build-tool  "boot"}
     ;; commented out example
     #_{:jdk-version 8

src/docker_clojure/core.clj

@@ -14,15 +14,19 @@
    [docker-clojure.log :refer [log] :as logger]
    [clojure.edn :as edn]))
 
-(defn contains-every-key-value?
-  "Returns true if the map `haystack` contains every key-value pair in the map
-  `needles`. `haystack` may contain additional keys that are not in `needles`.
-  Returns false if any of the keys in `needles` are missing from `haystack` or
-  have different values."
-  [haystack needles]
+(defn exclude-variant?
+  "Returns true if the map `variant` contains every key-value pair in the map
+  `exclusion`. `variant` may contain additional keys that are not in
+  `exclusion`. Some values of `exclusion` can also be a predicate of one
+  argument which is then tested against the respective value from `variant`.
+  Returns false if any of the keys in `exclusions` are missing from `variant` or
+  have different values, or the predicate value returned false."
+  [variant exclusion]
   (every? (fn [[k v]]
-            (= v (get haystack k)))
-          needles))
+            (if (fn? v)
+              (v (get variant k))
+              (= v (get variant k))))
+          exclusion))
 
 (defn base-image-tag
   [base-image jdk-version distro]
@@ -37,7 +41,7 @@
   "Returns true if `variant` matches one of `exclusions` elements (meaning
   `(contains-every-key-value? variant exclusion)` returns true)."
   [exclusions variant]
-  (some (partial contains-every-key-value? variant) exclusions))
+  (some (partial exclude-variant? variant) exclusions))
 
 (s/def ::variant
   (s/keys :req-un [::cfg/jdk-version ::cfg/base-image ::cfg/base-image-tag