Skip to content

Commit 8c949e5

Browse files
[ci] Test against JDK24
1 parent d8d959c commit 8c949e5

File tree

4 files changed

+14
-20
lines changed

4 files changed

+14
-20
lines changed

.circleci/config.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ executors:
2929
docker:
3030
- image: clojure:temurin-21-lein-2.11.2-noble
3131
<<: *defaults
32-
jdk23:
32+
jdk24:
3333
docker:
34-
- image: clojure:temurin-23-lein-2.11.2-noble
34+
- image: clojure:temurin-24-lein-2.11.2-noble
3535
<<: *defaults
3636

3737
# Runs a given set of steps, with some standard pre- and post-
@@ -81,7 +81,7 @@ commands:
8181
- base-src-jdk11.zip
8282
- base-src-jdk17.zip
8383
- base-src-jdk21.zip
84-
- base-src-jdk23.zip
84+
- base-src-jdk24.zip
8585
key: cache-<< parameters.cache_version >>-{{ checksum "/tmp/clojure_cache_seed" }}
8686

8787
setup-windows:
@@ -204,7 +204,7 @@ workflows:
204204
matrix:
205205
alias: "test"
206206
parameters:
207-
jdk_version: [jdk8, jdk11, jdk17, jdk21, jdk23]
207+
jdk_version: [jdk8, jdk11, jdk17, jdk21, jdk24]
208208
clojure_version: ["1.10", "1.11", "1.12"]
209209
<<: *run_always
210210
- test:
@@ -213,7 +213,7 @@ workflows:
213213
matrix:
214214
alias: "test_no_extra_deps"
215215
parameters:
216-
jdk_version: [jdk23]
216+
jdk_version: [jdk24]
217217
clojure_version: ["1.12"]
218218
command: ["test-no-extra-deps"]
219219
<<: *run_always
@@ -225,7 +225,7 @@ workflows:
225225
matrix:
226226
alias: "eastwood"
227227
parameters:
228-
jdk_version: [jdk8, jdk23]
228+
jdk_version: [jdk8, jdk24]
229229
<<: *run_always
230230
- lint:
231231
<<: *run_always

.circleci/download-jdk-sources.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ DEST=$3
77
# that is normally distributed with JDK.
88
wget "$URL" -O full-src.zip
99
unzip -q full-src.zip
10-
cp -r "$QUALIFIER"u-*/src/java.base/share/classes java.base
11-
cp -r "$QUALIFIER"u-*/src/java.desktop/share/classes java.desktop
10+
cp -r jdk-*/src/java.base/share/classes java.base
11+
cp -r jdk-*/src/java.desktop/share/classes java.desktop
1212
zip -qr $DEST java.base java.desktop
13-
rm -rf java.base java.desktop "$QUALIFIER"u- full-src.zip
13+
rm -rf java.base java.desktop jdk-* full-src.zip

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ base-src-jdk8.zip:
2222
touch $@
2323

2424
base-src-jdk11.zip:
25-
bash .circleci/download-jdk-sources.sh https://github.com/adoptium/jdk11u/archive/refs/tags/jdk-11.0.25+9.zip jdk11 $@
25+
bash .circleci/download-jdk-sources.sh https://github.com/adoptium/jdk/archive/refs/tags/jdk-11.0.25+9.zip jdk11 $@
2626

2727
base-src-jdk17.zip:
28-
bash .circleci/download-jdk-sources.sh https://github.com/adoptium/jdk17u/archive/refs/tags/jdk-17.0.13+11.zip jdk17 $@
28+
bash .circleci/download-jdk-sources.sh https://github.com/adoptium/jdk/archive/refs/tags/jdk-17.0.13+11.zip jdk17 $@
2929

3030
base-src-jdk21.zip:
31-
bash .circleci/download-jdk-sources.sh https://github.com/adoptium/jdk21u/archive/refs/tags/jdk-21.0.5+3.zip jdk21 $@
31+
bash .circleci/download-jdk-sources.sh https://github.com/adoptium/jdk/archive/refs/tags/jdk-21.0.5+3.zip jdk21 $@
3232

33-
base-src-jdk23.zip:
34-
bash .circleci/download-jdk-sources.sh https://github.com/adoptium/jdk23u/archive/refs/tags/jdk-23.0.1+11.zip jdk23 $@
33+
base-src-jdk24.zip:
34+
bash .circleci/download-jdk-sources.sh https://github.com/adoptium/jdk/archive/refs/tags/jdk-24+36.zip jdk24 $@
3535

3636
copy-sources-to-jdk: base-src-$(JDK_SRC_VERSION).zip
3737
mkdir -p $(JAVA_HOME)/lib && cp base-src-$(JDK_SRC_VERSION).zip $(JAVA_HOME)/lib/src.zip

test/orchard/java/parser_next_test.clj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,6 @@ returning "}
101101
(get-in [:members 'add '[java.lang.Object] :doc-fragments])))
102102
"Returns a data structure with carefully managed whitespace location")
103103

104-
(is (some #{{:type "text", :content " permission as well as\n"}}
105-
(-> `Thread
106-
source-info
107-
(get-in [:members 'getAllStackTraces [] :doc-fragments])))
108-
"A specific fragment starts with a single space and ends in a single newline")
109-
110104
(is (= {:content "<i>Param</i>&nbsp;<pre>obj</pre>:&nbsp;", :type "html"}
111105
(-> `Thread
112106
source-info

0 commit comments

Comments
 (0)