chore: upgrade clojure; add clj11, clj12 and java 25 to ci matrix

This commit is contained in:
Joel Kaasinen 2026-01-09 09:55:05 +02:00
parent e1d5789f40
commit 69b23c49b9
No known key found for this signature in database
3 changed files with 14 additions and 8 deletions

View file

@ -9,9 +9,10 @@ jobs:
strategy: strategy:
matrix: matrix:
# Supported Java versions: LTS releases and latest # Supported Java versions: LTS releases and latest
jdk: [11, 17, 21] jdk: [11, 17, 21, 25]
clojure: [11, 12]
name: Clojure (Java ${{ matrix.jdk }}) name: Clojure ${{ matrix.clojure }} (Java ${{ matrix.jdk }})
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -47,7 +48,7 @@ jobs:
run: ./lint.sh run: ./lint.sh
- name: Run tests - name: Run tests
run: ./scripts/test.sh clj run: ./scripts/test.sh clj${{ matrix.clojure }}
build-cljs: build-cljs:
name: ClojureScript name: ClojureScript

View file

@ -67,7 +67,8 @@
[lein-codox "0.10.8"] [lein-codox "0.10.8"]
[metosin/bat-test "0.4.4"]] [metosin/bat-test "0.4.4"]]
:profiles {:dev {:jvm-opts ^:replace ["-server"] :profiles {:clj11 {:dependencies [[org.clojure/clojure "1.11.4"]]}
:dev {:jvm-opts ^:replace ["-server"]
;; all module sources for development ;; all module sources for development
:source-paths ["modules/reitit/src" :source-paths ["modules/reitit/src"
@ -89,9 +90,9 @@
:java-source-paths ["modules/reitit-core/java-src"] :java-source-paths ["modules/reitit-core/java-src"]
:dependencies [[org.clojure/clojure "1.11.4"] :dependencies [[org.clojure/clojure "1.12.4"]
[thheller/shadow-cljs "3.3.4"] [thheller/shadow-cljs "3.3.4"]
[org.clojure/clojurescript "1.12.42"] [org.clojure/clojurescript "1.12.134"]
;; modules dependencies ;; modules dependencies
[metosin/schema-tools "0.13.1"] [metosin/schema-tools "0.13.1"]
@ -159,6 +160,7 @@
:aliases {"all" ["with-profile" "dev,default"] :aliases {"all" ["with-profile" "dev,default"]
"perf" ["with-profile" "default,dev,perf"] "perf" ["with-profile" "default,dev,perf"]
"test-clj" ["all" "do" ["bat-test"] ["check"]] "test-clj" ["all" "do" ["bat-test"] ["check"]]
"test-clj11" ["with-profile" "dev,default,clj11" "do" ["bat-test"] ["check"]]
;; NOTE: These are deprecated, kept around for ensuring shadow-cljs works ;; NOTE: These are deprecated, kept around for ensuring shadow-cljs works
;; the same way. ;; the same way.
"test-browser" ["doo" "chrome-headless" "test"] "test-browser" ["doo" "chrome-headless" "test"]

View file

@ -13,11 +13,14 @@ case $1 in
npx shadow-cljs release karma npx shadow-cljs release karma
npx karma start --single-run npx karma start --single-run
;; ;;
clj) clj11)
lein test-clj11
;;
clj12)
lein test-clj lein test-clj
;; ;;
*) *)
echo "Please select [clj|cljs]" echo "Please select [clj11|clj12|cljs]"
exit 1 exit 1
;; ;;
esac esac